diff --git a/.github/actions/setup-haxeshit/action.yml b/.github/actions/setup-haxeshit/action.yml
index 0cc544cf7..dcf5fd0a7 100644
--- a/.github/actions/setup-haxeshit/action.yml
+++ b/.github/actions/setup-haxeshit/action.yml
@@ -23,8 +23,6 @@ runs:
       with:
         path: .haxelib
         key: ${{ runner.os }}-hmm-${{ hashFiles('**/hmm.json') }}
-        restore-keys: |
-          ${{ runner.os }}-hmm-
     - if: ${{ steps.cache-hmm.outputs.cache-hit != 'true' }}
       name: hmm install
       run: |
diff --git a/.github/workflows/build-shit.yml b/.github/workflows/build-shit.yml
index 809a8b94b..ed10cbdc2 100644
--- a/.github/workflows/build-shit.yml
+++ b/.github/workflows/build-shit.yml
@@ -53,9 +53,8 @@ jobs:
           token: ${{ secrets.GH_RO_PAT }}
       - uses: ./.github/actions/setup-haxeshit
       - name: Make HXCPP cache dir
-        shell: bash
         run: |
-          mkdir -p ${{ runner.temp }}\\hxcpp_cache
+          mkdir -p ${{ runner.temp }}\hxcpp_cache
       - name: Restore build cache
         id: cache-build-win
         uses: actions/cache@v3
@@ -63,10 +62,8 @@ jobs:
           path: |
             .haxelib
             export
-            ${{ runner.temp }}\\hxcpp_cache
-          key: ${{ runner.os }}-build-win-${{ github.ref_name }}
-          restore-keys: |
-            ${{ runner.os }}-build-win-
+            ${{ runner.temp }}\hxcpp_cache
+          key: ${{ runner.os }}-build-win-${{ github.ref_name }}-${{ hashFiles('**/hmm.json') }}
       - name: Build game
         run: |
           haxelib run lime build windows -release -DNO_REDIRECT_ASSETS_FOLDER