diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
index 4b64417..1ab94db 100644
--- a/.github/workflows/lint.yml
+++ b/.github/workflows/lint.yml
@@ -13,7 +13,7 @@ jobs:
           path: |
             ~/v
             ~/.vmodules
-          key: ubuntu-latest-${{ github.sha }}
+          key: ${{ runner.os }}-${{ github.sha }}
           fail-on-cache-miss: true
       - name: Verify formatting
         run: ~/v/v fmt -verify ~/.vmodules/vibe && exit 0 || v fmt -diff . && exit 1
@@ -27,7 +27,7 @@ jobs:
           path: |
             ~/v
             ~/.vmodules
-          key: ubuntu-latest-${{ github.sha }}
+          key: ${{ runner.os }}-${{ github.sha }}
           fail-on-cache-miss: true
       - name: Vet
         run: ~/v/v vet -W ~/.vmodules/vibe
@@ -41,7 +41,7 @@ jobs:
           path: |
             ~/v
             ~/.vmodules
-          key: ubuntu-latest-${{ github.sha }}
+          key: ${{ runner.os }}-${{ github.sha }}
           fail-on-cache-miss: true
       - name: Setup dependencies
         uses: awalsh128/cache-apt-pkgs-action@latest
diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml
index 43d5a69..c60d947 100644
--- a/.github/workflows/linux.yml
+++ b/.github/workflows/linux.yml
@@ -30,7 +30,7 @@ jobs:
           path: |
             ~/v
             ~/.vmodules
-          key: ${{ matrix.os }}-${{ github.sha }}
+          key: ${{ runner.os }}-${{ github.sha }}-${{ matrix.os }}
 
   lint:
     needs: setup
@@ -57,7 +57,7 @@ jobs:
           path: |
             ~/v
             ~/.vmodules
-          key: ${{ matrix.os }}-${{ github.sha }}
+          key: ${{ runner.os }}-${{ github.sha }}-${{ matrix.os }}
           fail-on-cache-miss: true
       - name: Setup V
         run: ~/v/v symlink
@@ -90,7 +90,7 @@ jobs:
           path: |
             ~/v
             ~/.vmodules
-          key: ubuntu-latest-${{ github.sha }}
+          key: ${{ runner.os }}-${{ github.sha }}-ubuntu-latest
           fail-on-cache-miss: true
       - name: Setup V
         run: ~/v/v symlink
diff --git a/.github/workflows/performance_compare.yml b/.github/workflows/performance_compare.yml
index 741a30d..36d0e3d 100644
--- a/.github/workflows/performance_compare.yml
+++ b/.github/workflows/performance_compare.yml
@@ -45,7 +45,7 @@ jobs:
           path: |
             ~/v
             ~/.vmodules
-          key: ${{ matrix.os }}-${{ github.sha }}
+          key: ${{ runner.os }}-${{ github.sha }}-${{ matrix.os }}
 
   compare:
     needs: setup