diff --git a/.github/actions/cmake/action.yml b/.github/actions/cmake/action.yml
index 99eb2713..f84d38e5 100644
--- a/.github/actions/cmake/action.yml
+++ b/.github/actions/cmake/action.yml
@@ -50,6 +50,8 @@ runs:
           CMAKE_EXTRA_ARGS="${CMAKE_EXTRA_ARGS} '-DMINGW=ON' '-G MinGW Makefiles'"
         else
           vcpkg install doctest trompeloeil
+          # Need to use Ninja, otherwise ccache doesn't work
+          CMAKE_EXTRA_ARGS="${CMAKE_EXTRA_ARGS} '-G Ninja'"
         fi
 
         echo cmake_extra_args="${CMAKE_EXTRA_ARGS}" >> "$GITHUB_ENV"
@@ -90,6 +92,10 @@ runs:
         echo CXXFLAGS="-Werror ${CXXFLAGS}" >> "$GITHUB_ENV"
       shell: bash
 
+    - name: Setup MSVC toolchain
+      if: inputs.qt_arch == 'win64_msvc2019_64'
+      uses: ilammy/msvc-dev-cmd@v1.4.1
+
     - name: Configure CMake
       run: |
         CFLAGS="${CFLAGS}" \