diff --git a/.github/workflows/PR-Build-And-Test.yml b/.github/workflows/PR-Build-And-Test.yml
index 225afb7a..cbe6fab4 100644
--- a/.github/workflows/PR-Build-And-Test.yml
+++ b/.github/workflows/PR-Build-And-Test.yml
@@ -85,7 +85,7 @@ jobs:
         id: buildx
 
       - name: Restore BuildKit cache mounts
-        uses: actions/cache/restore@v6
+        uses: actions/cache@v6
         id: buildkit-cache
         with:
           path: buildkit-cache
@@ -98,7 +98,7 @@ jobs:
           builder: ${{ steps.buildx.outputs.name }}
           dockerfile: EssentialCSharp.Web/Dockerfile
           cache-dir: buildkit-cache
-          skip-extraction: true
+          skip-extraction: ${{ steps.buildkit-cache.outputs.cache-hit }}
 
       - name: Build Container Image
         uses: docker/build-push-action@v7