diff --git a/.github/workflows/end-to-end-tests.yaml b/.github/workflows/end-to-end-tests.yaml
index ef5601ec0e2..0a7d95e6dcb 100644
--- a/.github/workflows/end-to-end-tests.yaml
+++ b/.github/workflows/end-to-end-tests.yaml
@@ -62,6 +62,8 @@ jobs:
               with:
                   path: playwright-results.json
                   key: playwright-results
+                  restore-keys: |
+                      playwright-results-*
 
             - uses: actions/setup-node@v4
               with:
@@ -232,7 +234,7 @@ jobs:
               uses: actions/cache/save@v4
               with:
                   path: playwright-results.json
-                  key: playwright-results
+                  key: playwright-results-${{ github.run_id }}
 
             # Upload the HTML report even if one of our reporters fails, this can happen when stale screenshots are detected
             - name: Upload HTML report
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index 139737f362a..209a2a5d828 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -71,6 +71,8 @@ jobs:
               with:
                   path: tenbin-report.json
                   key: tenbin-report
+                  restore-keys: |
+                      tenbin-report-*
 
             - name: Run tests
               run: |
@@ -139,4 +141,4 @@ jobs:
               uses: actions/cache/save@v4
               with:
                   path: tenbin-report.json
-                  key: tenbin-report
+                  key: tenbin-report-${{ github.run_id }}