diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml
index abb362002d..96bcbcb135 100644
--- a/.github/workflows/windows.yml
+++ b/.github/workflows/windows.yml
@@ -25,8 +25,9 @@ jobs:
       - uses: actions/cache@v1
         with:
           path: C:\vcpkg\downloads
-          key: ${{ runner.os }}-vcpkg-download-${{ github.sha }}
+          key: ${{ runner.os }}-vcpkg-download-${{ matrix.os }}-${{ github.sha }}
           restore-keys: |
+            ${{ runner.os }}-vcpkg-download-${{ matrix.os }}-
             ${{ runner.os }}-vcpkg-download-
       - name: Install libraries with vcpkg
         run: |
@@ -34,8 +35,9 @@ jobs:
       - uses: actions/cache@v1
         with:
           path: C:\Users\runneradmin\AppData\Local\Temp\chocolatey
-          key: ${{ runner.os }}-chocolatey-${{ github.sha }}
+          key: ${{ runner.os }}-chocolatey-${{ matrix.os }}-${{ github.sha }}
           restore-keys: |
+            ${{ runner.os }}-chocolatey-${{ matrix.os }}-
             ${{ runner.os }}-chocolatey-
       - name: Install libraries with chocolatey
         run: |