diff --git a/.circleci/config.yml b/.circleci/config.yml
index 808f8c42..79c40820 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -22,14 +22,14 @@ aliases:
   # Increase the version key to clear the cache.
   save-cache: &save-cache
     save_cache:
-      key: v1-ycm-{{ .Environment.CIRCLE_JOB }}
+      key: v2-ycm-{{ .Environment.CIRCLE_JOB }}
       paths:
         - ~/Library/Caches/Homebrew
-        - ~/.cache/pip
+        - ~/Library/Caches/pip
         - ~/.pyenv
   restore-cache: &restore-cache
     restore_cache:
-      key: v1-ycm-{{ .Environment.CIRCLE_JOB }}
+      key: v2-ycm-{{ .Environment.CIRCLE_JOB }}
 jobs:
   python2:
     <<: *common
diff --git a/.circleci/install_dependencies.sh b/.circleci/install_dependencies.sh
index 3071ff2f..af9cd4e0 100755
--- a/.circleci/install_dependencies.sh
+++ b/.circleci/install_dependencies.sh
@@ -73,7 +73,6 @@ if [ -z \"\${PYENV_LOADING}\" ]; then
   unset PYENV_LOADING
 fi" >> $BASH_ENV
 
-pip install -U pip wheel setuptools
 pip install -r python/test_requirements.txt
 
 set +e
diff --git a/ci/travis/travis_install.sh b/ci/travis/travis_install.sh
index 9436c750..fc93e414 100644
--- a/ci/travis/travis_install.sh
+++ b/ci/travis/travis_install.sh
@@ -63,7 +63,6 @@ python_version=$(python -c 'import sys; print( "{0}.{1}".format( sys.version_inf
 echo "Checking python version (actual ${python_version} vs expected ${YCM_PYTHON_VERSION})"
 test ${python_version} == ${YCM_PYTHON_VERSION}
 
-pip install -U pip wheel setuptools
 pip install -r python/test_requirements.txt
 
 # The build infrastructure prints a lot of spam after this script runs, so make