diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index b49042551cf..2b4ac7267b0 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -253,13 +253,14 @@ jobs:
           py -3 --version
           bash --version
 
-      - name: Restore vcpkg tools cache
-        id: vcpkg-tools-cache
+      - name: Restore vcpkg downloads cache
+        id: vcpkg-downloads-cache
         uses: actions/cache/restore@v5
         with:
-          path: ~/AppData/Local/vcpkg/downloads/tools
-          key: ${{ github.job }}-vcpkg-tools-${{ github.run_id }}
-          restore-keys: ${{ github.job }}-vcpkg-tools-
+          path: |
+            ~/AppData/Local/vcpkg/downloads/*
+            !~/AppData/Local/vcpkg/downloads/tools
+          key: ${{ github.job }}-vcpkg-downloads-${{ hashFiles('vcpkg.json') }}
 
       - name: Restore vcpkg binary cache
         uses: actions/cache/restore@v5
@@ -279,13 +280,15 @@ jobs:
           path: ~/AppData/Local/vcpkg/archives
           key: ${{ steps.vcpkg-binary-cache.outputs.cache-primary-key }}
 
-      - name: Save vcpkg tools cache
+      - name: Save vcpkg downloads cache
         uses: actions/cache/save@v5
-        # Only save cache from one job as they share tools. If the matrix is expanded to jobs with unique tools, this may need amending.
-        if: github.event_name != 'pull_request' && github.ref_name == github.event.repository.default_branch && steps.vcpkg-tools-cache.outputs.cache-hit != 'true' && matrix.job-type == 'standard'
+        # Only save cache from the 'standard' job, as it includes the necessary downloads for other jobs in the matrix. If the matrix is modified, this may need amending.
+        if: github.event_name != 'pull_request' && github.ref_name == github.event.repository.default_branch && steps.vcpkg-binary-cache.outputs.cache-hit != 'true' && steps.vcpkg-downloads-cache.outputs.cache-hit != 'true' && matrix.job-type == 'standard'
         with:
-          path: ~/AppData/Local/vcpkg/downloads/tools
-          key: ${{ steps.vcpkg-tools-cache.outputs.cache-primary-key }}
+          path: |
+            ~/AppData/Local/vcpkg/downloads/*
+            !~/AppData/Local/vcpkg/downloads/tools  # Cache the tools once as archives, but not redundantly in extracted form.
+          key: ${{ steps.vcpkg-downloads-cache.outputs.cache-primary-key }}
 
       - name: Build
         run: |