diff --git a/.github/workflows/build_and_test.yml b/.github/workflows/build_and_test.yml
index 35ddbc5..d749cb9 100644
--- a/.github/workflows/build_and_test.yml
+++ b/.github/workflows/build_and_test.yml
@@ -20,9 +20,9 @@ jobs:
           path: |
             ~/.cache/bazel
           # add import_llvm.bzl so that a new build occurs after an LLVM commit hash update
-          key: ${{ runner.os }}-bazel-${{ hashFiles('.bazelrc', 'WORKSPACE', 'bazel/import_llvm.bzl') }}
+          key: ${{ runner.os }}-bazel-${{ hashFiles('.bazelversion', '.bazelrc', 'WORKSPACE') }}-${{ hashFiles('bazel/import_llvm.bzl') }}
           restore-keys: |
-            ${{ runner.os }}-bazel-
+            ${{ runner.os }}-bazel-${{ hashFiles('.bazelversion', '.bazelrc', 'WORKSPACE') }}-
 
       - name: "Run `bazel build`"
         run: |