diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index c01b67a73..7c1882292 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -5,7 +5,6 @@ on:
       - master
       - develop
   pull_request:
-
 jobs:
   linux:
     name: Linux
@@ -30,7 +29,7 @@ jobs:
         uses: actions/cache@v5
         with:
           path: |
-            vcpkg_installed
+            build/vcpkg_installed
             submodules/vcpkg/downloads
           key: ${{ runner.os }}-vcpkg-${{ hashFiles('vcpkg.json') }}
           restore-keys: |
@@ -59,6 +58,9 @@ jobs:
   windows:
     name: Windows
     runs-on: windows-latest
+    env:
+      VCPKG_DOWNLOADS: ${{ github.workspace }}\submodules\vcpkg\downloads
+      VCPKG_BINARY_SOURCES: 'clear;files,${{ github.workspace }}\vcpkg_archives,readwrite'
     steps:
       - name: Checkout source
         uses: actions/checkout@v5
@@ -67,9 +69,9 @@ jobs:
 
       - name: Enable long paths
         run: git config --global core.longpaths true
-
+        
       - name: Setup MSVC environment
-        uses: ilammy/msvc-dev-cmd@v1
+        uses: TheMrMilchmann/setup-msvc-dev@v4
         with:
           arch: x64
 
@@ -77,11 +79,10 @@ jobs:
         uses: actions/cache@v5
         with:
           path: |
-            vcpkg_installed
-            submodules/vcpkg/downloads
+            ${{ env.VCPKG_DOWNLOADS }}
+            ${{ github.workspace }}/vcpkg_archives
           key: ${{ runner.os }}-vcpkg-${{ hashFiles('vcpkg.json') }}
           restore-keys: |
-            ${{ runner.os }}-vcpkg-${{ hashFiles('vcpkg.json') }}-
             ${{ runner.os }}-vcpkg-
 
       - name: Configure