diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 1b2059bd06..1da6a6d2b4 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -52,9 +52,10 @@ jobs:
         id: run-caches-restore
         with:
           path: ${{ env.CACHE_DIR }}
-          key: ${{ runner.os }}-login-run-caches-${{ github.sha }}-${{github.run_number}}
+          key: ${{ runner.os }}-login-run-caches-${{github.ref_name}}-${{ github.sha }}-${{github.run_attempt}}
           restore-keys: |
-            ${{ runner.os }}-login-run-caches-${{ github.sha }}-
+            ${{ runner.os }}-login-run-caches-${{github.ref_name}}-${{ github.sha }}-
+            ${{ runner.os }}-login-run-caches-${{github.ref_name}}-
             ${{ runner.os }}-login-run-caches-
       - name: Show Run Caches
         run: make show-run-caches