diff --git a/.circleci/config.yml b/.circleci/config.yml
index 64cc3230..95ce3957 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -10,7 +10,7 @@ only_maintainers: &only_maintainers
       # Forked pull requests have CIRCLE_BRANCH set to pull/XXX
       ignore: /pull\/[0-9]+/
 orbs:
-  go: circleci/go@1.5.0
+  go: circleci/go@1.7.0
   codecov: codecov/codecov@3.1.0
   snyk: snyk/snyk@1.1.2
 jobs:
@@ -18,6 +18,7 @@ jobs:
     parameters:
       pattern:
         type: string
+    resource_class: large
     machine:
       image: ubuntu-2004:202010-01
     environment:
@@ -31,8 +32,8 @@ jobs:
       - checkout
       - go/install:
           version: "1.16.2"
-          # Disable cache at it seem to broke go 1.16 installation
-          cache: false
+      - go/load-cache:
+          key: test_acc
       - run: make install-tools
       - run:
           name: Setup Google credentials
@@ -54,6 +55,9 @@ jobs:
               -H "Content-Type: application/json" \
               -d "{\"content\": \"❌ Acceptance tests failed\nSuite: ${ACC_PATTERN}\n<${CIRCLE_BUILD_URL}>\" }"\
               ${DISCORD_WEBHOOK}
+      - go/save-cache:
+          key: test_acc
+          path: /home/circleci/.go_workspace/pkg/mod
       - store_test_results:
           path: ./
   lint:
@@ -75,23 +79,28 @@ jobs:
       - run: make install-tools
       - run: make lint
   test:
+    resource_class: large
     machine:
       image: ubuntu-2004:202107-02
     steps:
       - checkout
+      - go/install:
+          version: "1.16.2"
+      - go/load-cache:
+          key: test
+      - run: make install-tools
       - run:
           name: Run tests
-          command: |
-            docker run\
-              -v$(pwd):/app\
-              -w /app\
-              golang:1.16\
-              bash -c 'make install-tools && make test'
+          command: make test
+      - go/save-cache:
+          key: test
+          path: /home/circleci/.go_workspace/pkg/mod
       - codecov/upload:
           flags: unit
       - store_test_results:
           path: ./
   release:
+    resource_class: large
     docker:
       - image: golang:1.16
     steps: