diff --git a/.github/workflows/windows_x86_builds.yml b/.github/workflows/windows_x86_builds.yml
index 255d8cd75..40f34467f 100644
--- a/.github/workflows/windows_x86_builds.yml
+++ b/.github/workflows/windows_x86_builds.yml
@@ -23,14 +23,14 @@ jobs:
       matrix:
         include:
           - name: Editor (target=release_debug, tools=yes)
-            cache-name: windows-editor
+            cache-name: windows-editor-x86
             target: release_debug
             tools: true
             arch: x86
             bin: "./bin/pandemonium.windows.opt.tools.32.exe"
 
           - name: Template (target=release, tools=no)
-            cache-name: windows-template
+            cache-name: windows-template-x86
             target: release
             arch: x86
             tools: false
@@ -47,6 +47,11 @@ jobs:
       - name: Setup python and scons
         uses: ./.github/actions/pandemonium-deps
 
+      - name: Set up Visual Studio shell
+        uses: egor-tensin/vs-shell@v2
+        with:
+          arch: x86
+
       - name: Compilation
         uses: ./.github/actions/pandemonium-build
         with:
@@ -54,6 +59,7 @@ jobs:
           platform: windows
           target: ${{ matrix.target }}
           tools: ${{ matrix.tools }}
+          arch: ${{ matrix.arch }}
 
       - name: Prepare artifact
         run: |