diff --git a/.circleci/config.yml b/.circleci/config.yml
index 98114fd3517..3bf543836d2 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -91,6 +91,10 @@ jobs:
       - run: bazel build src/...
       - run: bazel test src/... tools/public_api_guard/...
 
+      # Note: We want to save the cache in this job because the workspace cache also
+      # includes the Bazel repository cache that will be updated in this job.
+      - *save_cache
+
   # ----------------------------------------------------------------
   # Job that runs the e2e tests with Protractor and Chrome Headless
   # ----------------------------------------------------------------
@@ -238,8 +242,6 @@ jobs:
           path: /tmp/cdk-umd-minified-bundles
           destination: /angular_material/cdk_release_output/
 
-      - *save_cache
-
   # ----------------------------------------
   # Job that publishes the build snapshots
   # ----------------------------------------