diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index bfaba8db8d..3d07d00e9e 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -52,7 +52,10 @@ jobs:
         id: run-caches-restore
         with:
           path: ${{ env.CACHE_DIR }}
-          key: ${{ runner.os }}-login-run-caches
+          key: ${{ runner.os }}-login-run-caches-${{ github.event.inputs.ref-tag }}
+          restore-keys: |
+              ${{ runner.os }}-login-run-caches-${{ github.event.inputs.ref-tag }}-
+              ${{ runner.os }}-login-run-caches-
       - name: Show Run Caches
         run: make show-run-caches
       - run: make login-quality