diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index c1275cdd..3f17b042 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -42,15 +42,13 @@ jobs:
 
       - uses: actions/cache@v2
         with:
-          # FIXME: In combination with `actions-rs/toolchain@v1` this may
-          #        somehow cause the AArch64 version of rustup to end up here
-          # ~/.cargo/bin/
           path: |
+            ~/.cargo/bin/
             ~/.cargo/registry/index/
             ~/.cargo/registry/cache/
             ~/.cargo/git/db/
             target/
-          key: ${{ runner.name }}-cargo-${{ hashFiles('**/Cargo.lock') }}
+          key: ${{ runner.name }}-${{ matrix.cross-target }}-cargo-${{ hashFiles('**/Cargo.lock') }}
 
       - name: Set up Rust toolchain
         uses: actions-rs/toolchain@v1