diff --git a/.circleci/config.yml b/.circleci/config.yml
index 16bafdb58..2723c13cc 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -9,7 +9,7 @@ jobs:
       - checkout
       - restore_cache:
           keys:
-            - pkg-cache-{{ checksum "Gopkg.lock" }}
+            - pkg-cache-{{ checksum "Gopkg.lock" }}-v1
       - run:
           name: Run gofmt -s
           command: |
@@ -31,9 +31,9 @@ jobs:
           command: |
             bash <(curl -s https://codecov.io/bash)
       - save_cache:
-          key: pkg-cache-{{ checksum "Gopkg.lock" }}
+          key: pkg-cache-{{ checksum "Gopkg.lock" }}-v1
           paths:
-            - "/go/pkg"
+            - ~/.cache/go-build
 
   release:
     docker: