diff --git a/.github/workflows/clippy.yml b/.github/workflows/clippy.yml
index c733fe7ac4..e67ef0ff95 100644
--- a/.github/workflows/clippy.yml
+++ b/.github/workflows/clippy.yml
@@ -32,9 +32,10 @@ jobs:
           toolchain: "${{env.RUST_STABLE_VERSION}}"
 
       - name: Fetch cache
-        uses: Swatinem/rust-cache@a95ba195448af2da9b00fb742d14ffaaf3c21f43 # v2.7.0
+        uses: Swatinem/rust-cache@f0deed1e0edfc6a9be95417288c0e1099b1eeec3 # v2.7.7
         with:
           shared-key: "fellowship-cache-clippy"
+          save-if: ${{ github.ref == 'refs/heads/master' }}
 
       - name: Clippy
         run: |
diff --git a/.github/workflows/cmd.yml b/.github/workflows/cmd.yml
index 28bde3352b..e8ec2cc23c 100644
--- a/.github/workflows/cmd.yml
+++ b/.github/workflows/cmd.yml
@@ -294,9 +294,10 @@ jobs:
 
       - name: Setup Cache
         if: startsWith(steps.get-pr-comment.outputs.group2, 'bench')
-        uses: Swatinem/rust-cache@a95ba195448af2da9b00fb742d14ffaaf3c21f43 # v2.7.0
+        uses: Swatinem/rust-cache@f0deed1e0edfc6a9be95417288c0e1099b1eeec3 # v2.7.7
         with:
-          shared-key: "fellowship-cmd"
+          shared-key: "fellowship-cache-cmd"
+          save-if: ${{ github.ref == 'refs/heads/master' }}
 
       - name: Run cmd
         id: cmd
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 6bc4e525ba..b1f9867bf7 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -70,9 +70,10 @@ jobs:
           toolchain: "${{env.RUST_STABLE_VERSION}}"
 
       - name: Fetch cache
-        uses: Swatinem/rust-cache@a95ba195448af2da9b00fb742d14ffaaf3c21f43 # v2.7.0
+        uses: Swatinem/rust-cache@f0deed1e0edfc6a9be95417288c0e1099b1eeec3 # v2.7.7
         with:
-          shared-key: "fellowship-cache-tests"
+          shared-key: "fellowship-cache-runtime-tests"
+          save-if: ${{ github.ref == 'refs/heads/master' }}
 
       - name: Download frame-omni-bencher
         run: |
@@ -138,9 +139,10 @@ jobs:
           toolchain: "${{env.RUST_STABLE_VERSION}}"
 
       - name: Fetch cache
-        uses: Swatinem/rust-cache@a95ba195448af2da9b00fb742d14ffaaf3c21f43 # v2.7.0
+        uses: Swatinem/rust-cache@f0deed1e0edfc6a9be95417288c0e1099b1eeec3 # v2.7.7
         with:
-          shared-key: "fellowship-cache-tests"
+          shared-key: "fellowship-cache-integration-tests"
+          save-if: ${{ github.ref == 'refs/heads/master' }}
 
       - name: Test ${{ matrix.itest.name }}
         run: cargo test -p ${{ matrix.itest.package }} --release --locked -q
@@ -173,9 +175,10 @@ jobs:
           toolchain: "${{env.RUST_STABLE_VERSION}}"
 
       - name: Fetch cache
-        uses: Swatinem/rust-cache@a95ba195448af2da9b00fb742d14ffaaf3c21f43 # v2.7.0
+        uses: Swatinem/rust-cache@f0deed1e0edfc6a9be95417288c0e1099b1eeec3 # v2.7.7
         with:
-          shared-key: "fellowship-cache-tests"
+          shared-key: "fellowship-cache-chain-spec-tests"
+          save-if: ${{ github.ref == 'refs/heads/master' }}
 
       - name: Build
         run: cargo test -p chain-spec-generator --release --locked -q --features=runtime-benchmarks
@@ -210,9 +213,10 @@ jobs:
           toolchain: "${{env.RUST_STABLE_VERSION}}"
 
       - name: Fetch cache
-        uses: Swatinem/rust-cache@a95ba195448af2da9b00fb742d14ffaaf3c21f43 # v2.7.0
+        uses: Swatinem/rust-cache@f0deed1e0edfc6a9be95417288c0e1099b1eeec3 # v2.7.7
         with:
-          shared-key: "fellowship-cache-integration-tests"
+          shared-key: "fellowship-cache-zombienet-tests"
+          save-if: ${{ github.ref == 'refs/heads/master' }}
 
       - name: Build
         run: |