diff --git a/.github/actions/spin-ci-dependencies/action.yml b/.github/actions/spin-ci-dependencies/action.yml
index 3d35d371ba..84519b18c4 100644
--- a/.github/actions/spin-ci-dependencies/action.yml
+++ b/.github/actions/spin-ci-dependencies/action.yml
@@ -114,6 +114,7 @@ runs:
       if: ${{ inputs.rust-cache == 'true' }}
       with:
         shared-key: "${{ runner.os }}-full-${{ hashFiles('./Cargo.lock', './os-release') }}"
+        save-if: ${{ github.ref == 'refs/heads/main' }}
 
     ## Install nomad
     - name: Install nomad
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index a7370bd1bb..227bf7192c 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -44,7 +44,6 @@ jobs:
         with:
           rust: true
           rust-wasm: true
-          rust-cache: true
 
       - name: Run lints on main code
         run: BUILD_SPIN_EXAMPLES=0 make lint
@@ -64,7 +63,6 @@ jobs:
         with:
           rust: true
           rust-wasm: true
-          rust-cache: true
 
       - name: Cargo Build
         run: cargo build --workspace --release --all-targets --features openssl/vendored --features all-tests
@@ -99,7 +97,6 @@ jobs:
         with:
           rust: true
           rust-cross: true
-          rust-cache: true
 
       - name: Cargo Build
         run: cross build --target ${{ matrix.config.target }} --release --features openssl/vendored
@@ -127,7 +124,7 @@ jobs:
         with:
           rust: true
           rust-wasm: true
-          rust-cache: true
+          rust-cache: "${{ matrix.os == 'windows-latest' }} || ${{ matrix.os == 'macos-13' }}"
           openssl-windows: "${{ matrix.os == 'windows-latest' }}"
 
       - name: Cargo Build
@@ -156,7 +153,6 @@ jobs:
         with:
           rust: true
           rust-wasm: true
-          rust-cache: true
           nomad: true
 
       - name: Check disk space (Before)
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 6c1fd21a75..674d5597fd 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -331,7 +331,6 @@ jobs:
         with:
           rust: true
           rust-cross: true
-          rust-cache: true
 
       - name: Cargo Build
         run: cross build --target ${{ matrix.config.target }} --release --features openssl/vendored