diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 76655302d..8eccd4537 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -68,7 +68,7 @@ jobs:
           df -h .
 
       - name: Restore buildcache
-        uses: actions/cache@v2
+        uses: pat-s/always-upload-cache@v2
         with:
           path: ${{env.BUILDCACHE_DIR}}
           key: buildcache-${{runner.os}}-${{matrix.preset}}-${{github.sha}}
@@ -127,7 +127,7 @@ jobs:
           rm /tmp/$NAME.dmg
 
       - name: Restore buildcache
-        uses: actions/cache@v2
+        uses: pat-s/always-upload-cache@v2
         with:
           path: ${{env.BUILDCACHE_DIR}}
           key: buildcache-${{runner.os}}-universal-${{github.sha}}
@@ -203,7 +203,7 @@ jobs:
           Get-PSDrive
 
       - name: Restore buildcache
-        uses: actions/cache@v2
+        uses: pat-s/always-upload-cache@v2
         with:
           path: ${{env.BUILDCACHE_DIR}}
           key: buildcache-${{runner.os}}-${{matrix.preset}}-${{github.sha}}
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index fed8bd248..3b47f528e 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -68,7 +68,7 @@ jobs:
           df -h .
 
       - name: Restore buildcache
-        uses: actions/cache@v2
+        uses: pat-s/always-upload-cache@v2
         with:
           path: ${{env.BUILDCACHE_DIR}}
           key: buildcache-${{runner.os}}-${{matrix.preset}}-${{github.sha}}
@@ -145,7 +145,7 @@ jobs:
           rm /tmp/$NAME.dmg
 
       - name: Restore buildcache
-        uses: actions/cache@v2
+        uses: pat-s/always-upload-cache@v2
         with:
           path: ${{env.BUILDCACHE_DIR}}
           key: buildcache-${{runner.os}}-universal-${{github.sha}}
@@ -309,7 +309,7 @@ jobs:
           Get-PSDrive
 
       - name: Restore buildcache
-        uses: actions/cache@v2
+        uses: pat-s/always-upload-cache@v2
         with:
           path: ${{env.BUILDCACHE_DIR}}
           key: buildcache-${{runner.os}}-clang-${{github.sha}}
diff --git a/CMakePresets.json b/CMakePresets.json
index 246811ad3..bfd30461a 100644
--- a/CMakePresets.json
+++ b/CMakePresets.json
@@ -251,8 +251,8 @@
       "cacheVariables": {
         "CMAKE_C_COMPILER_LAUNCHER": "buildcache",
         "CMAKE_CXX_COMPILER_LAUNCHER": "buildcache",
-        "CMAKE_C_FLAGS_RELWITHDEBINFO": "/MD /Z7 /O2 /Ob1 /DNDEBUG",
-        "CMAKE_CXX_FLAGS_RELWITHDEBINFO": "/MD /Z7 /O2 /Ob1 /DNDEBUG",
+        "CMAKE_C_FLAGS_RELWITHDEBINFO": "/Z7 /O2 /Ob1 /DNDEBUG",
+        "CMAKE_CXX_FLAGS_RELWITHDEBINFO": "/Z7 /O2 /Ob1 /DNDEBUG",
         "CMAKE_INSTALL_PREFIX": "$env{BUILD_DIR}/install"
       },
       "environment": {