diff --git a/.circleci/config.yml b/.circleci/config.yml
index 4db6a775f..78781ca07 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -42,9 +42,7 @@ jobs:
             export PATH="`pwd`/cmake-3.4.1-Darwin-x86_64/CMake.app/Contents/bin:$PATH"
       - run:
           name: Upgrade Brew
-          command: |
-            set -e
-            brew upgrade
+          command: brew upgrade || true
       - run:
           name: Install libffi dependencies
           command: |
@@ -73,6 +71,18 @@ jobs:
             export PATH="`pwd`/cmake-3.4.1-Darwin-x86_64/CMake.app/Contents/bin:$PATH"
             export PATH="$HOME/.cargo/bin:$PATH"
             ./integration_tests/nginx/test.sh
+      - save_cache:
+          paths:
+            - /usr/local/cargo/registry
+            - target/debug/.fingerprint
+            - target/debug/build
+            - target/debug/deps
+            - target/release/.fingerprint
+            - target/release/build
+            - target/release/deps
+            - /usr/local/Homebrew
+            - /usr/local/Cellar
+          key: v4-cargo-cache-darwin-{{ arch }}-{{ checksum "Cargo.lock" }}
 
   test-and-build:
     docker:
@@ -117,6 +127,7 @@ jobs:
             - target/release/.fingerprint
             - target/release/build
             - target/release/deps
+            - /usr/local/Homebrew
           key: v4-cargo-cache-linux-{{ arch }}-{{ checksum "Cargo.lock" }}
 
   test-and-build-macos:
@@ -136,9 +147,7 @@ jobs:
             export PATH="`pwd`/cmake-3.4.1-Darwin-x86_64/CMake.app/Contents/bin:$PATH"
       - run:
           name: Upgrade Brew
-          command: |
-            set -e
-            brew upgrade
+          command: brew upgrade || true
       - run:
           name: Install libffi dependencies
           command: |
@@ -184,6 +193,8 @@ jobs:
             - target/release/.fingerprint
             - target/release/build
             - target/release/deps
+            - /usr/local/Homebrew
+            - /usr/local/Cellar
           key: v4-cargo-cache-darwin-{{ arch }}-{{ checksum "Cargo.lock" }}
 
   test-rust-nightly: