diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 531bbe22..43d92535 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -10,12 +10,18 @@ jobs:
       - run: ls ~/
       - name: Checkout
         uses: actions/checkout@v3.6.0
-      - name: Cache Initial Setup
+      - name: Cache Client Setup
         uses: actions/cache@v3.3.2
         with:
           path: |
-            /home/runner/work/neiist-website/neiist-website
-          key: initial-setup-${{ runner.os }}
+            /home/runner/work/neiist-website/neiist-website/client
+          key: client-setup-${{ runner.os }}
+      - name: Cache Server Setup
+        uses: actions/cache@v3.3.2
+        with:
+          path: |
+            /home/runner/work/neiist-website/neiist-website/server
+          key: server-setup-${{ runner.os }}
       - run: ls ~/
  
   client_dependencies:
@@ -30,9 +36,7 @@ jobs:
       - name: Cache Client Dependencies
         uses: actions/cache@v3.3.2
         with:
-          path: |
-            /home/runner/work/neiist-website/neiist-website
-          key: initial-setup-${{ runner.os }}
+          key: client-setup-${{ runner.os }}
       - name: Install client dependencies
         run: |
           cd client
@@ -48,6 +52,10 @@ jobs:
         uses: actions/setup-node@v3.8.2
         with:
           node-version: "16"
+      - name: Cache Client Dependencies
+        uses: actions/cache@v3.3.2
+        with:
+          key: client-setup-${{ runner.os }}
       - name: Build client
         run: |
           cd client
@@ -63,6 +71,10 @@ jobs:
         uses: actions/setup-node@v3.8.2
         with:
           node-version: "16"
+      - name: Cache Server Dependencies
+        uses: actions/cache@v3.3.2
+        with:
+          key: server-setup-${{ runner.os }}
       - name: Install server dependencies
         run: |
           cd server
@@ -78,6 +90,10 @@ jobs:
         uses: actions/setup-node@v3.8.2
         with:
           node-version: "16"
+      - name: Cache Client Dependencies
+        uses: actions/cache@v3.3.2
+        with:
+          key: client-setup-${{ runner.os }}
       - name: Frontend Tests
         if: ${{ github.event_name == 'pull_request' && github.event.pull_request.base.ref == 'master' || github.event_name == 'push' && github.ref == 'refs/heads/master' }}
         run: |