diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml
index c918539793..d32354ac96 100644
--- a/.github/workflows/android.yml
+++ b/.github/workflows/android.yml
@@ -34,7 +34,7 @@ jobs:
           path: |
             3rdParty/buildCache
             !3rdParty/buildCache/android/vcpkgcache/
-          key: android-${{ matrix.type }}-${{ hashFiles('android/*.sh') }}
+          key: android-${{ matrix.type }}-${{ hashFiles('android/*.sh', '.github/workflows/android.yml') }}
 
       - name: Configure Python
         if: ${{ success() && contains(matrix.type, 'vcpkg') }}
diff --git a/.github/workflows/coverity.yml b/.github/workflows/coverity.yml
index ae8c686af0..0cf60f9fe5 100644
--- a/.github/workflows/coverity.yml
+++ b/.github/workflows/coverity.yml
@@ -25,7 +25,7 @@ jobs:
           path: |
             3rdParty/buildCache
             !3rdParty/buildCache/linux/vcpkgcache/
-          key: linux-coverity
+          key: linux-coverity-${{ hashFiles('3rdParty/*Linux*.sh', 'linux/*.sh', '.github/workflows/coverity.yml') }}
 
       - name: Automake
         if: success()
diff --git a/.github/workflows/flutter-macos.yml b/.github/workflows/flutter-macos.yml
index bb0840210a..e8785b96b2 100644
--- a/.github/workflows/flutter-macos.yml
+++ b/.github/workflows/flutter-macos.yml
@@ -18,17 +18,17 @@ jobs:
     steps:
       - uses: actions/checkout@v2
         with:
-          fetch-depth: 2          
-          
+          fetch-depth: 2
+
       - name: Setup xcode
         uses: maxim-lobanov/setup-xcode@v1
         with:
-          xcode-version: '12.5.1'         
+          xcode-version: '12.5.1'
 
       - name: Setup flutter
         uses: subosito/flutter-action@v1
         with:
-          channel: 'beta'      
+          channel: 'beta'
 
       - name: Setup macos desktop
         if: matrix.type == 'macos'
@@ -39,8 +39,7 @@ jobs:
         if: matrix.type == 'macos'
         with:
           path: 3rdParty/buildCache
-          key: osx-flutter-${{ hashFiles('3rdParty/*Mac*.sh', 'mac_build/dependencyNames.sh', 'mac_build/[bB]uild*.sh') }}
-          restore-keys: osx-flutter-
+          key: osx-flutter-${{ hashFiles('3rdParty/*Mac*.sh', 'mac_build/setupForBOINC.sh', 'mac_build/dependencyNames.sh', 'mac_build/[bB]uild*.sh', '.github/workflows/flutter-macos.yml') }}
 
       - name: Build macos client
         if: matrix.type == 'macos'
@@ -54,7 +53,7 @@ jobs:
         run: |
           cd samples/flutter/
           flutter create boinc
-          cd boinc/ 
+          cd boinc/
           flutter build macos
 
       - name: Build ios
@@ -62,5 +61,5 @@ jobs:
         run:  |
           cd samples/flutter/
           flutter create boinc
-          cd boinc/ 
+          cd boinc/
           flutter build ios --release --no-codesign
diff --git a/.github/workflows/flutter-ubuntu.yml b/.github/workflows/flutter-ubuntu.yml
index 77a87b53bb..7383a11871 100644
--- a/.github/workflows/flutter-ubuntu.yml
+++ b/.github/workflows/flutter-ubuntu.yml
@@ -19,7 +19,7 @@ jobs:
       - uses: actions/checkout@v2
         with:
           fetch-depth: 1
-          
+
       - name: Setup Java
         if: matrix.type == 'android'
         uses: actions/setup-java@v1
@@ -37,7 +37,7 @@ jobs:
 
       - name: Setup linux desktop
         if: matrix.type == 'linux'
-        run: flutter config --enable-linux-desktop  
+        run: flutter config --enable-linux-desktop
 
       - name: Install linux dependencies
         if: matrix.type == 'linux'
@@ -56,8 +56,7 @@ jobs:
           path: |
             3rdParty/buildCache
             !3rdParty/buildCache/linux/vcpkgcache/
-          key: linux-client-vcpkg-${{ hashFiles('3rdParty/*Linux*.sh', 'linux/*.sh') }}
-          restore-keys: linux-client-vcpkg-
+          key: linux-flutter-client-vcpkg-${{ hashFiles('3rdParty/*Linux*.sh', 'linux/*.sh', '.github/workflows/flutter-ubuntu.yml') }}
 
       - name: Download vcpkg binary cache
         if: matrix.type == 'linux'
@@ -88,7 +87,7 @@ jobs:
 
       - name: Install flutter dependencies
         run: cd samples/flutter/boinc/ && flutter pub get
-        
+
       - name: Build linux
         if: matrix.type == 'linux'
         run: |
@@ -109,14 +108,14 @@ jobs:
         if: success() && matrix.type == 'android'
         uses: edgarrc/action-7z@v1.0.4
         with:
-          args: 7z a -t7z -mx=9 deploy/flutter_${{ matrix.type }}.7z -r0 samples/flutter/boinc/build/app/outputs/flutter-apk/app-release.apk     
+          args: 7z a -t7z -mx=9 deploy/flutter_${{ matrix.type }}.7z -r0 samples/flutter/boinc/build/app/outputs/flutter-apk/app-release.apk
 
       - name: Prepare linux
         if: success() && matrix.type == 'linux'
         uses: edgarrc/action-7z@v1.0.4
         with:
           args: 7z a -t7z -mx=9 deploy/flutter_${{ matrix.type }}.7z -r0 samples/flutter/boinc/build/linux/x64/release/bundle/*
-      
+
       - name: Upload ${{ matrix.type }}
         if: success()
         uses: actions/upload-artifact@v2
diff --git a/.github/workflows/flutter-windows.yml b/.github/workflows/flutter-windows.yml
index 9229c62ff9..561b2719c3 100644
--- a/.github/workflows/flutter-windows.yml
+++ b/.github/workflows/flutter-windows.yml
@@ -18,7 +18,7 @@ jobs:
     steps:
       - uses: actions/checkout@v2
         with:
-          fetch-depth: 2          
+          fetch-depth: 2
 
       - name: Setup msbuild
         uses: microsoft/setup-msbuild@v1.0.2
@@ -42,8 +42,7 @@ jobs:
         with:
           path: |
             ${{ github.workspace }}\3rdParty\Windows\cuda\
-          key: windows-x64-Release-${{ hashFiles('win_build/vcpkg_3rdparty_dependencies_vs2019.vcxproj') }}
-          restore-keys: windows-x64-Release-
+          key: windows-flutter-x64-Release-${{ hashFiles('win_build/vcpkg_3rdparty_dependencies_vs2019.vcxproj', '.github/workflows/flutter-windows.yml') }}
 
       - name: Configure Python
         if: matrix.type == 'windows'
@@ -72,7 +71,7 @@ jobs:
           flutter create boinc
           cd boinc/
           flutter build winuwp
-        
+
       - name: Build windows
         if: matrix.type == 'windows'
         run: |
@@ -80,7 +79,7 @@ jobs:
           flutter create boinc
           cd boinc/
           flutter build windows
-        
+
       - name: Build web
         if: matrix.type == 'web'
         run: |
@@ -88,7 +87,7 @@ jobs:
           flutter create boinc
           cd boinc/
           flutter build web
-        
+
       - name: Prepare windows
         if: success() && matrix.type == 'windows'
         run: |
@@ -103,7 +102,7 @@ jobs:
         if: success() && matrix.type == 'winuwp'
         run: |
             7z.exe a -t7z -mx=9 deploy/flutter_${{ matrix.type }}.7z -r0 samples/flutter/boinc/build/winuwp/runner_uwp/Release/*
-      
+
       - name: Upload ${{ matrix.type }}
         if: success()
         uses: actions/upload-artifact@v2
diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml
index 94d8065d50..21ef60823a 100644
--- a/.github/workflows/linux.yml
+++ b/.github/workflows/linux.yml
@@ -39,8 +39,7 @@ jobs:
           path: |
             3rdParty/buildCache
             !3rdParty/buildCache/linux/vcpkgcache/
-          key: linux-${{ matrix.type }}-${{ hashFiles('3rdParty/*Linux*.sh', 'linux/*.sh') }}
-          restore-keys: linux-${{ matrix.type }}-
+          key: linux-${{ matrix.type }}-${{ hashFiles('3rdParty/*Linux*.sh', 'linux/*.sh', '.github/workflows/linux.yml') }}
 
       - name: Configure Python
         if: ${{ success() && contains(matrix.type, 'vcpkg') }}
@@ -154,4 +153,4 @@ jobs:
           ACCESS_KEY: ${{ secrets.S3_ACCESS_KEY }}
           SECRET_KEY: ${{ secrets.S3_SECRET_KEY }}
         run: |
-          python ./deploy/manage_vcpkg_archive_cache.py upload 3rdParty/buildCache/linux/vcpkgcache/vcpkg/archives/ linux "edu.berkeley.boinc.github.actions.build.vcpkg.binary.cache" "$ACCESS_KEY" "$SECRET_KEY"          
+          python ./deploy/manage_vcpkg_archive_cache.py upload 3rdParty/buildCache/linux/vcpkgcache/vcpkg/archives/ linux "edu.berkeley.boinc.github.actions.build.vcpkg.binary.cache" "$ACCESS_KEY" "$SECRET_KEY"
diff --git a/.github/workflows/osx.yml b/.github/workflows/osx.yml
index e898604f1d..174669c2df 100644
--- a/.github/workflows/osx.yml
+++ b/.github/workflows/osx.yml
@@ -26,8 +26,7 @@ jobs:
         uses: actions/cache@v2
         with:
           path: 3rdParty/buildCache
-          key: osx-${{ matrix.type }}-${{ hashFiles('3rdParty/*Mac*.sh', 'mac_build/dependencyNames.sh', 'mac_build/[bB]uild*.sh') }}
-          restore-keys: osx-${{ matrix.type }}-
+          key: osx-${{ matrix.type }}-${{ hashFiles('3rdParty/*Mac*.sh', 'mac_build/setupForBOINC.sh', 'mac_build/dependencyNames.sh', 'mac_build/[bB]uild*.sh', '.github/workflows/osx.yml') }}
 
       - name: install dependencies
         run: ./3rdParty/buildMacDependencies.sh -q
diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml
index 5967f3c660..33c31bcb77 100644
--- a/.github/workflows/windows.yml
+++ b/.github/workflows/windows.yml
@@ -50,8 +50,7 @@ jobs:
         with:
           path: |
             ${{ github.workspace }}\3rdParty\Windows\cuda\
-          key: windows-${{ matrix.platform }}-${{ matrix.configuration }}-${{ hashFiles('win_build/vcpkg_3rdparty_dependencies_vs2019.vcxproj') }}
-          restore-keys: windows-${{ matrix.platform }}-${{ matrix.configuration }}-
+          key: windows-${{ matrix.platform }}-${{ matrix.configuration }}-${{ hashFiles('win_build/vcpkg_3rdparty_dependencies_vs2019.vcxproj', '.github/workflows/windows.yml') }}
 
       - name: Configure Python
         if: ${{ success() }}