diff --git a/.circleci/config.yml b/.circleci/config.yml
index 9c939e93601e7..a7098ac65ce45 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -354,8 +354,10 @@ jobs:
       # compilation results from build-sbt
       - save_cache:
           key: v1-maven-build-with-version-{{ .Branch }}-{{ .Revision }}
-          paths:
-            - .
+          paths: .
+      - save_cache:
+          key: v1-maven-dependency-cache-versioned-{{ checksum "pom.xml" }}
+          paths: ~/.m2
 
   deploy:
     <<: *defaults
@@ -368,7 +370,7 @@ jobs:
       - restore_cache:
           key: v1-maven-build-with-version-{{ .Branch }}-{{ .Revision }}
       - restore_cache:
-          key: maven-dependency-cache-{{ checksum "pom.xml" }}
+          key: v1-maven-dependency-cache-versioned-{{ checksum "pom.xml" }}
       - restore_cache:
           key: build-binaries-{{ checksum "build/mvn" }}-{{ checksum "build/sbt" }}