diff --git a/.github/workflows/build-check.yaml b/.github/workflows/build-check.yaml
index 9969bcf7..95ea49f4 100644
--- a/.github/workflows/build-check.yaml
+++ b/.github/workflows/build-check.yaml
@@ -157,12 +157,13 @@ jobs:
         with:
           fetch-depth: 0
 
-      # Workaround for https://github.com/lukka/run-vcpkg/issues/251.
-      - name: Prepare vcpkg binary cache
+      # TODO: Find a way to include compiler version in the cache key so that
+      # runner image updates don't require manual cache deletion.
+      - name: Restore vcpkg binary cache
         uses: actions/cache@v5
         with:
           path: ${{ github.workspace }}/.vcpkg-cache
-          key: vcpkg-${{ matrix.config.os }}-${{ matrix.config.buildPreset }}-${{ hashFiles(format('build/{0}/vcpkg_installed/vcpkg/status', matrix.config.configurePreset)) }}
+          key: vcpkg-${{ matrix.config.os }}-${{ matrix.config.buildPreset }}-${{ hashFiles('vcpkg.json') }}
           restore-keys: vcpkg-${{ matrix.config.os }}-${{ matrix.config.buildPreset }}-
 
       - name: Prepare vcpkg
diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
index cb0d9a7e..0e0f34b3 100644
--- a/.github/workflows/release.yaml
+++ b/.github/workflows/release.yaml
@@ -43,7 +43,6 @@ jobs:
             buildPreset: ninja-multi-vcpkg-portable-release
 
     env:
-      VCPKG_BINARY_SOURCES: clear;files,${{ github.workspace }}/.vcpkg-cache,readwrite
       VCPKG_BUILD_TYPE: release
       VCPKG_DEFAULT_TRIPLET: x64-windows
       ZEAL_RELEASE_BUILD: ON
@@ -54,14 +53,6 @@ jobs:
         with:
           fetch-depth: 0
 
-      # Workaround for https://github.com/lukka/run-vcpkg/issues/251.
-      - name: Prepare vcpkg binary cache
-        uses: actions/cache@v5
-        with:
-          path: ${{ github.workspace }}/.vcpkg-cache
-          key: vcpkg-${{ matrix.config.os }}-${{ matrix.config.buildPreset }}-${{ hashFiles(format('build/{0}/vcpkg_installed/vcpkg/status', matrix.config.configurePreset)) }}
-          restore-keys: vcpkg-${{ matrix.config.os }}-${{ matrix.config.buildPreset }}-
-
       - name: Prepare vcpkg
         uses: lukka/run-vcpkg@v11
         with: