diff --git a/.github/workflows/benchmark-core.yml b/.github/workflows/benchmark-core.yml
index 6cee4e1b6ee..9a611072722 100644
--- a/.github/workflows/benchmark-core.yml
+++ b/.github/workflows/benchmark-core.yml
@@ -34,7 +34,6 @@ jobs:
       - name: Restore Rust cache for yew packages
         uses: Swatinem/rust-cache@v2
         with:
-          shared-key: yew-packages
           workspaces: |
             yew-master
             current-pr
diff --git a/.github/workflows/benchmark-ssr.yml b/.github/workflows/benchmark-ssr.yml
index e61e9697241..182ef66c673 100644
--- a/.github/workflows/benchmark-ssr.yml
+++ b/.github/workflows/benchmark-ssr.yml
@@ -39,7 +39,6 @@ jobs:
       - name: Restore Rust cache for yew packages
         uses: Swatinem/rust-cache@v2
         with:
-          shared-key: yew-packages
           workspaces: |
             yew-master
             current-pr
diff --git a/.github/workflows/benchmark.yml b/.github/workflows/benchmark.yml
index d4ba5cd132b..bed776545f6 100644
--- a/.github/workflows/benchmark.yml
+++ b/.github/workflows/benchmark.yml
@@ -51,7 +51,7 @@ jobs:
       - name: Restore Rust cache for yew packages
         uses: Swatinem/rust-cache@v2
         with:
-          shared-key: yew-packages
+          save-if: ${{ github.ref == 'refs/heads/master' }}
           workspaces: |
             yew
 
diff --git a/.github/workflows/clippy.yml b/.github/workflows/clippy.yml
index 7c03318f37b..f9901ac0cdc 100644
--- a/.github/workflows/clippy.yml
+++ b/.github/workflows/clippy.yml
@@ -36,7 +36,7 @@ jobs:
 
       - uses: Swatinem/rust-cache@v2
         with:
-          shared-key: clippy
+          save-if: ${{ github.ref == 'refs/heads/master' }}
 
       - name: Lint feature soundness
         if: matrix.profile == 'dev'
@@ -66,7 +66,7 @@ jobs:
 
       - uses: Swatinem/rust-cache@v2
         with:
-          shared-key: clippy
+          save-if: ${{ github.ref == 'refs/heads/master' }}
 
       - name: Run clippy
         run: |
diff --git a/.github/workflows/main-checks.yml b/.github/workflows/main-checks.yml
index a4880a09ccc..89a8e2b1bf7 100644
--- a/.github/workflows/main-checks.yml
+++ b/.github/workflows/main-checks.yml
@@ -25,9 +25,6 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v6
-      - uses: Swatinem/rust-cache@v2
-        with:
-          shared-key: yew-packages
 
       # for wasm-bindgen-cli, always use stable rust
       - name: Setup toolchain
@@ -35,16 +32,20 @@ jobs:
         with:
           toolchain: stable
 
-      - name: Install wasm-bindgen-cli
-        shell: bash
-        run: ./ci/install-wasm-bindgen-cli.sh
-
       - name: Setup toolchain
         uses: dtolnay/rust-toolchain@master
         with:
           toolchain: nightly
           targets: wasm32-unknown-unknown
 
+      - uses: Swatinem/rust-cache@v2
+        with:
+          save-if: ${{ github.ref == 'refs/heads/master' }}
+
+      - name: Install wasm-bindgen-cli
+        shell: bash
+        run: ./ci/install-wasm-bindgen-cli.sh
+
       - uses: browser-actions/setup-geckodriver@latest
         with:
           token: ${{ secrets.GITHUB_TOKEN }}
@@ -73,26 +74,26 @@ jobs:
     steps:
       - uses: actions/checkout@v6
 
-      - uses: Swatinem/rust-cache@v2
-        with:
-          shared-key: yew-packages
-
       # for wasm-bindgen-cli, always use stable rust
       - name: Setup toolchain
         uses: dtolnay/rust-toolchain@master
         with:
           toolchain: stable
 
-      - name: Install wasm-bindgen-cli
-        shell: bash
-        run: ./ci/install-wasm-bindgen-cli.sh
-
       - name: Setup toolchain
         uses: dtolnay/rust-toolchain@master
         with:
           toolchain: ${{ matrix.toolchain }}
           targets: wasm32-unknown-unknown
 
+      - uses: Swatinem/rust-cache@v2
+        with:
+          save-if: ${{ github.ref == 'refs/heads/master' }}
+
+      - name: Install wasm-bindgen-cli
+        shell: bash
+        run: ./ci/install-wasm-bindgen-cli.sh
+
       - uses: browser-actions/setup-geckodriver@latest
         with:
           token: ${{ secrets.GITHUB_TOKEN }}
@@ -132,7 +133,7 @@ jobs:
 
       - uses: Swatinem/rust-cache@v2
         with:
-          shared-key: yew-packages
+          save-if: ${{ github.ref == 'refs/heads/master' }}
 
       - name: Run native tests
         env:
@@ -162,7 +163,7 @@ jobs:
 
       - uses: Swatinem/rust-cache@v2
         with:
-          shared-key: yew-packages
+          save-if: ${{ github.ref == 'refs/heads/master' }}
 
       - name: Run tests
         env:
@@ -197,6 +198,8 @@ jobs:
           source ~/.bashrc
 
       - uses: Swatinem/rust-cache@v2
+        with:
+          save-if: ${{ github.ref == 'refs/heads/master' }}
 
       - name: Run WASI tests for yew
         run: |
@@ -232,6 +235,8 @@ jobs:
           source ~/.bashrc
 
       - uses: Swatinem/rust-cache@v2
+        with:
+          save-if: ${{ github.ref == 'refs/heads/master' }}
 
       - name: Build and run ${{ matrix.package }}
         run: |
diff --git a/.github/workflows/publish-examples.yml b/.github/workflows/publish-examples.yml
index 6ba957ca147..148133bc744 100644
--- a/.github/workflows/publish-examples.yml
+++ b/.github/workflows/publish-examples.yml
@@ -25,8 +25,6 @@ jobs:
           components: rust-src
 
       - uses: Swatinem/rust-cache@v2
-        with:
-          shared-key: publish-examples
 
       - uses: jetli/trunk-action@v0.5.1
         with:
diff --git a/.github/workflows/size-cmp.yml b/.github/workflows/size-cmp.yml
index cb9d880f2c2..ab11cb573aa 100644
--- a/.github/workflows/size-cmp.yml
+++ b/.github/workflows/size-cmp.yml
@@ -49,10 +49,8 @@ jobs:
           components: rust-src
           targets: wasm32-unknown-unknown
 
-      - name: Restore Rust cache for master
+      - name: Restore Rust cache
         uses: Swatinem/rust-cache@v2
-        with:
-          shared-key: size-compare
 
       - name: Setup Trunk
         uses: jetli/trunk-action@v0.5.1
diff --git a/.github/workflows/test-website.yml b/.github/workflows/test-website.yml
index b5227817b23..b3c9c146fe3 100644
--- a/.github/workflows/test-website.yml
+++ b/.github/workflows/test-website.yml
@@ -34,7 +34,7 @@ jobs:
 
       - uses: Swatinem/rust-cache@v2
         with:
-          shared-key: yew-packages
+          save-if: ${{ github.ref == 'refs/heads/master' }}
 
       - uses: browser-actions/setup-geckodriver@latest
         with: