diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml
index ff90b50..fb857c9 100644
--- a/.github/workflows/test.yaml
+++ b/.github/workflows/test.yaml
@@ -42,10 +42,13 @@ jobs:
       - name: Setup Rust, checkout and restore caches
         uses: ./.github/actions/setup-rust
 
-      - name: Download build artifact from previous job
-        uses: actions/download-artifact@v3
+      - name: Restore frontend build cache
+        uses: actions/cache@v4
         with:
-          name: frontend-build-${{ github.run_id }}
+          path: apps/nxmesh-frontend/dist
+          key: frontend-build-${{ runner.os }}-run-${{ github.run_id }}
+          restore-keys: |
+            frontend-build-${{ runner.os }}-
 
       - name: Run tests
         run: cargo test --all-features
@@ -68,10 +71,13 @@ jobs:
         with:
           components: clippy, rustfmt
 
-      - name: Download build artifact from previous job
-        uses: actions/download-artifact@v3
+      - name: Restore frontend build cache
+        uses: actions/cache@v4
         with:
-          name: frontend-build-${{ github.run_id }}
+          path: apps/nxmesh-frontend/dist
+          key: frontend-build-${{ runner.os }}-run-${{ github.run_id }}
+          restore-keys: |
+            frontend-build-${{ runner.os }}-
 
       - name: Run clippy
         run: cargo clippy --all-features
@@ -138,8 +144,10 @@ jobs:
           cd apps/nxmesh-frontend
           bun run build
 
-      - name: Upload frontend build artifact
-        uses: actions/upload-artifact@v3
+      - name: Cache frontend build
+        uses: actions/cache@v4
         with:
-          name: frontend-build-${{ github.run_id }}
           path: apps/nxmesh-frontend/dist
+          key: frontend-build-${{ runner.os }}-run-${{ github.run_id }}
+          restore-keys: |
+            frontend-build-${{ runner.os }}-