diff --git a/.circleci/config.yml b/.circleci/config.yml
index 442b7fe33cf..5dd230cf06b 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -41,17 +41,23 @@ commands:
     steps:
       - run: .circleci/bin/halt-for-doc-only-changes.sh && circleci step halt || true # skip Circle for guides
       - checkout
-
+      - run: |
+          gem install bundler -v"~> 2.1" --conservative
+          bundle lock
       - restore_cache:
           keys:
-            - solidus-gems-v2-{{ .Branch }}
-            - solidus-gems-v2
+            - solidus-gems-v3-{{ .Branch }}-{{ checksum "Gemfile.lock" }}
+            - solidus-gems-v3-{{ .Branch }}
+            - solidus-gems-v3-master
+            - solidus-gems-v3
 
       - run: |
-          bundle install --path=vendor/bundle
+          bundle config set path 'vendor/bundle'
+          bundle check || bundle install
+          bundle clean
 
       - save_cache:
-          key: solidus-gems-v2-{{ .Branch }}-{{ checksum "Gemfile.lock" }}
+          key: solidus-gems-v3-{{ .Branch }}-{{ checksum "Gemfile.lock" }}
           paths:
             - vendor/bundle