diff --git a/.github/workflows/nightly.yaml b/.github/workflows/nightly.yaml
index beb2e517b..b65829598 100644
--- a/.github/workflows/nightly.yaml
+++ b/.github/workflows/nightly.yaml
@@ -157,7 +157,6 @@ jobs:
 
       - name: Delete cache
         # For now, avoid deleting cache on pull request changes to nightly. This improves PR experience.
-        if: env.TRIGGER != 'pull_request'
         run: |
           if [ -d "/tmp/plugins_testing_download_cache" ]
           then
diff --git a/.github/workflows/pr.yaml b/.github/workflows/pr.yaml
index fbd36f766..283d3971d 100644
--- a/.github/workflows/pr.yaml
+++ b/.github/workflows/pr.yaml
@@ -131,6 +131,20 @@ jobs:
       - name: Checkout
         uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
 
+      # TODO(Tyler): Remove this once the cache has stabilized
+      - name: Delete cache (mac only)
+        if: matrix.os == 'macOS'
+        # For now, avoid deleting cache on pull request changes to nightly. This improves PR experience.
+        run: |
+          if [ -d "/tmp/plugins_testing_download_cache" ]
+          then
+            tmp_dir=/tmp/${GITHUB_RUN_ID}-${GITHUB_RUN_NUMBER}-${GITHUB_RUN_ATTEMPT}
+            mv "/tmp/plugins_testing_download_cache" ${tmp_dir}
+            chmod -R u+w ${tmp_dir}
+            rm -rf ${tmp_dir}
+          fi
+        shell: bash
+
       - name: Linter Tests
         # Run tests using KnownGoodVersion with any modified linters and conditionally all linters
         uses: ./.github/actions/linter_tests
diff --git a/tests/types/index.ts b/tests/types/index.ts
index 2c3f8245e..5f0868dfb 100644
--- a/tests/types/index.ts
+++ b/tests/types/index.ts
@@ -88,6 +88,7 @@ export interface LintAction {
   parser: string;
   report: string;
   cacheHit?: boolean;
+  cacheExpiration?: string;
   upstream: boolean;
   fileGroupName: string;
   command: string;
diff --git a/tests/utils/landing_state.ts b/tests/utils/landing_state.ts
index 3b9a67f4f..a306170c8 100644
--- a/tests/utils/landing_state.ts
+++ b/tests/utils/landing_state.ts
@@ -26,6 +26,7 @@ const normalizePlatformPath = (originalPath: string | undefined) => {
 const extractLintActionFields = ({
   actionDurationMs: _actionDurationMs,
   cacheHit: _cacheHit,
+  cacheExpiration: _cacheExpiration,
   paths: _paths,
   ...rest
 }: LintAction): LintAction => ({