diff --git a/.circleci/config.yml b/.circleci/config.yml
index 140117a509d400dd6fa9905750dc3f7fff2c1a20..4a1754307c0eccd6a23ef0b283f21c8ae0ec116e 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -11,20 +11,14 @@ jobs:
     working_directory: ~/repo
     steps:
       - checkout
-      - run:
-          name: Generate cache key
-          command: date +%Y-%m > .circle-cache-key
-      - restore_cache:
-          keys:
-            - deps-{{checksum ".circle-cache-key"}}
       - run:
           name: Build and run unit tests
-          command: gradle build
+          command: gradle build publishToMavenLocal
       - save_cache:
           paths:
             - ~/.gradle
             - ~/.m2
-          key: deps-{{checksum ".circle-cache-key"}}
+          key: deps-{{ .Revision }}
       - run:
           name: Generate Code Coverage Report
           command: gradle codeCoverageReport
@@ -41,20 +35,12 @@ jobs:
     working_directory: ~/repo
     steps:
       - checkout
-      - run:
-          name: Generate cache key
-          command: date +%Y-%m > .circle-cache-key
       - restore_cache:
           keys:
-            - deps-{{checksum ".circle-cache-key"}}
+            - deps-{{ .Revision }}
       - run:
           name: Load all dependencies
           command: cd ~/repo/plugins/maven/graphql-java-codegen-maven-plugin && mvn dependency:go-offline
-      - save_cache:
-          paths:
-            - ~/.gradle
-            - ~/.m2
-          key: deps-{{checksum ".circle-cache-key"}}
       - run:
           name: Build library
           command: cd ~/repo && gradle publishToMavenLocal -x test
@@ -78,20 +64,12 @@ jobs:
     working_directory: ~/repo
     steps:
       - checkout
-      - run:
-          name: Generate cache key
-          command: date +%Y-%m > .circle-cache-key
       - restore_cache:
           keys:
-            - deps-{{checksum ".circle-cache-key"}}
+            - deps-{{ .Revision }}
       - run:
           name: Load all dependencies
           command: cd ~/repo/plugins/gradle/graphql-java-codegen-gradle-plugin && gradle dependencies
-      - save_cache:
-          paths:
-            - ~/.gradle
-            - ~/.m2
-          key: deps-{{checksum ".circle-cache-key"}}
       - run:
           name: Build library
           command: cd ~/repo && gradle publishToMavenLocal -x test