diff --git a/linting-and-non-system-tests/action.yml b/linting-and-non-system-tests/action.yml
index 8cd4560..888c8e9 100644
--- a/linting-and-non-system-tests/action.yml
+++ b/linting-and-non-system-tests/action.yml
@@ -52,8 +52,10 @@ runs:
       uses: actions/cache/restore@v5
       with:
         path: tmp/turbo_rspec_runtime.log
-        key: parallel-spec-non-system-runtimes-${{ github.sha }}_${{ github.run_attempt }}
-        restore-keys: parallel-spec-non-system-runtimes-
+        key: parallel-spec-non-system-runtimes-${{ github.head_ref || github.ref_name }}-${{ github.sha }}
+        restore-keys: |
+          parallel-spec-non-system-runtimes-${{ github.head_ref || github.ref_name }}-
+          parallel-spec-non-system-runtimes-
 
     - name: Setup Parallel Databases
       shell: bash
@@ -68,9 +70,16 @@ runs:
       shell: bash
       run: bundle exec parallel_rspec --verbose --exclude-pattern "/system/"
 
+    - name: Save Turbo-Test Runtime Stats
+      if: always()
+      uses: actions/cache/save@v5
+      with:
+        path: tmp/turbo_rspec_runtime.log
+        key: parallel-spec-non-system-runtimes-${{ github.head_ref || github.ref_name }}-${{ github.sha }}
+
     - name: Publish Test Results
       uses: mikepenz/action-junit-report@v6
-      if: success() || failure()
+      if: always()
       with:
         check_name: Test Results
         report_paths: tmp/rspec-*.xml
diff --git a/system-tests/action.yml b/system-tests/action.yml
index 69245ac..3f88378 100644
--- a/system-tests/action.yml
+++ b/system-tests/action.yml
@@ -66,8 +66,10 @@ runs:
       uses: actions/cache/restore@v5
       with:
         path: tmp/turbo_rspec_runtime.log
-        key: parallel-spec-system-runtimes-${{ github.sha }}_${{ github.run_attempt }}
-        restore-keys: parallel-spec-system-runtimes-
+        key: parallel-spec-system-runtimes-${{ github.head_ref || github.ref_name }}-${{ github.sha }}
+        restore-keys: |
+          parallel-spec-system-runtimes-${{ github.head_ref || github.ref_name }}-
+          parallel-spec-system-runtimes-
 
     - name: Setup Parallel Databases
       shell: bash
@@ -80,9 +82,16 @@ runs:
         GOOGLE_CHROME_BIN: ${{ case(inputs.web-driver == 'selenium', steps.setup-chrome.outputs.chrome-path, '') }}
         CAPYBARA_DRIVER: js
 
+    - name: Save Turbo-Test Runtime Stats
+      if: always()
+      uses: actions/cache/save@v5
+      with:
+        path: tmp/turbo_rspec_runtime.log
+        key: parallel-spec-system-runtimes-${{ github.head_ref || github.ref_name }}-${{ github.sha }}
+
     - name: Publish Test Results
       uses: mikepenz/action-junit-report@v6
-      if: success() || failure()
+      if: always()
       with:
         check_name: Test Results
         report_paths: tmp/rspec-*.xml