diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 766834fa0..e310c5057 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -69,7 +69,9 @@ jobs:
         uses: actions/cache@v2
         with:
           path: ${{env.BUILDCACHE_DIR}}
-          key: buildcache-ubuntu-20.04-${{matrix.preset}}
+          key: buildcache-${{runner.os}}-${{matrix.preset}}-${{github.sha}}
+          restore-keys: |
+            buildcache-${{runner.os}}-${{matrix.preset}}-
 
       - name: Configure CMake
         run: cmake --preset x-linux-ci-${{matrix.preset}}
@@ -131,7 +133,9 @@ jobs:
         uses: actions/cache@v2
         with:
           path: ${{env.BUILDCACHE_DIR}}
-          key: buildcache-macos-10.15-universal
+          key: buildcache-${{runner.os}}-universal-${{github.sha}}
+          restore-keys: |
+            buildcache-${{runner.os}}-universal-
 
       - name: Configure CMake
         run: cmake --preset x-macos-ci
@@ -210,7 +214,9 @@ jobs:
         uses: actions/cache@v2
         with:
           path: ${{env.BUILDCACHE_DIR}}
-          key: buildcache-windows-2019-${{matrix.preset}}
+          key: buildcache-${{runner.os}}-${{matrix.preset}}-${{github.sha}}
+          restore-keys: |
+            buildcache-${{runner.os}}-${{matrix.preset}}-
 
       - name: Enable Visual Studio environment
         uses: ilammy/msvc-dev-cmd@v1
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 88f125906..2d7487cf7 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -71,7 +71,9 @@ jobs:
         uses: actions/cache@v2
         with:
           path: ${{env.BUILDCACHE_DIR}}
-          key: buildcache-ubuntu-20.04-${{matrix.preset}}
+          key: buildcache-${{runner.os}}-${{matrix.preset}}-${{github.sha}}
+          restore-keys: |
+            buildcache-${{runner.os}}-${{matrix.preset}}-
 
       - name: Configure CMake
         run: cmake --preset x-linux-ci-${{matrix.preset}}
@@ -148,7 +150,9 @@ jobs:
         uses: actions/cache@v2
         with:
           path: ${{env.BUILDCACHE_DIR}}
-          key: buildcache-macos-10.15-universal
+          key: buildcache-${{runner.os}}-universal-${{github.sha}}
+          restore-keys: |
+            buildcache-${{runner.os}}-universal-
 
       - name: Configure CMake
         run: cmake --preset x-macos-ci
@@ -318,7 +322,9 @@ jobs:
         uses: actions/cache@v2
         with:
           path: ${{env.BUILDCACHE_DIR}}
-          key: buildcache-windows-2019-clang
+          key: buildcache-${{runner.os}}-clang-${{github.sha}}
+          restore-keys: |
+            buildcache-${{runner.os}}-clang-
 
       - name: Enable Visual Studio environment
         uses: ilammy/msvc-dev-cmd@v1
diff --git a/extern/athena b/extern/athena
index 064839bad..2aa5b7673 160000
--- a/extern/athena
+++ b/extern/athena
@@ -1 +1 @@
-Subproject commit 064839bad63e13a2df42601423fc611660095da8
+Subproject commit 2aa5b76732e27e33441f292ab39fbaf4d3b0a4d0