diff --git a/.github/workflows/run-phpstan-pull.yml b/.github/workflows/run-phpstan-pull.yml
index 7b7750120..e6663148e 100644
--- a/.github/workflows/run-phpstan-pull.yml
+++ b/.github/workflows/run-phpstan-pull.yml
@@ -92,7 +92,7 @@ jobs:
         id: larastan-restore
         with:
           path: ./build/phpstan
-          key: phpstan-result-cache
+          key: phpstan-${{ matrix.os }}-P${{ matrix.php }}-L${{ matrix.laravel }}
 
       - name: Run PHPStan Tests
         run: ./vendor/bin/phpstan analyse
@@ -100,5 +100,5 @@ jobs:
       - uses: actions/cache/save@v4
         id: larastan-save
         with:
-          path: ${{ steps.larastan-restore.path }}
-          key: ${{ steps.larastan-restore.key }}
+          path: ./build/phpstan
+          key: phpstan-${{ matrix.os }}-P${{ matrix.php }}-L${{ matrix.laravel }}
diff --git a/.github/workflows/run-phpstan.yml b/.github/workflows/run-phpstan.yml
index 1d64b1766..1b7304a85 100644
--- a/.github/workflows/run-phpstan.yml
+++ b/.github/workflows/run-phpstan.yml
@@ -95,7 +95,7 @@ jobs:
         id: larastan-restore
         with:
           path: ./build/phpstan
-          key: phpstan-${{ matrix.os }}-P${{ matrix.php }}-L${{ matrix.laravel }}-composer-${{ hashFiles('**/composer.json') }}
+          key: phpstan-${{ matrix.os }}-P${{ matrix.php }}-L${{ matrix.laravel }}
 
       - name: Run PHPStan Tests
         run: ./vendor/bin/phpstan analyse
@@ -103,5 +103,5 @@ jobs:
       - uses: actions/cache/save@v4
         id: larastan-save
         with:
-          path: ${{ steps.larastan-restore.path }}
-          key: ${{ steps.larastan-restore.key }}
+          path: ./build/phpstan
+          key: phpstan-${{ matrix.os }}-P${{ matrix.php }}-L${{ matrix.laravel }}