diff --git a/circle.yml b/circle.yml
index 11076d884..8771aac48 100644
--- a/circle.yml
+++ b/circle.yml
@@ -20,7 +20,11 @@ checkout:
 dependencies:
   cache_directories:
     - "~/.ccache"
+    - "~/.apt-cache"
+    - "mason_packages"
   pre:
+    # https://discuss.circleci.com/t/add-ability-to-cache-apt-get-programs/598/3
+    - sudo rm -rf /var/cache/apt/archives && sudo ln -s ~/.apt-cache /var/cache/apt/archives && mkdir -p ~/.apt-cache/partial
     - sudo wget -O - http://llvm.org/apt/llvm-snapshot.gpg.key | sudo apt-key add -
     - sudo add-apt-repository -y "deb http://llvm.org/apt/precise/ llvm-toolchain-precise-${LLVM_VERSION} main"
     - sudo add-apt-repository -y ppa:ubuntu-toolchain-r/test
@@ -33,7 +37,11 @@ dependencies:
 
 database:
   pre:
-    - ./scripts/circleci.sh
+    - bootstrap.sh
+    - | ./configure \
+        CC="clang-${LLVM_VERSION}" \
+        CXX="$(pwd)/mason_packages/.link/bin/ccache clang++-${LLVM_VERSION} -Qunused-arguments"
+    - make
   override:
     - psql -c 'create database template_postgis;'
     - psql -c 'create extension postgis;' -d template_postgis
diff --git a/scripts/circleci.sh b/scripts/circleci.sh
deleted file mode 100755
index 5dffa339c..000000000
--- a/scripts/circleci.sh
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/usr/bin/env bash
-
-set -e -u
-set -o pipefail
-
-source bootstrap.sh
-CCACHE=$(pwd)/mason_packages/.link/bin/ccache
-${CCACHE} --version
-${CCACHE} -p || true
-${CCACHE} --show-stats || true
-./configure CC="clang-${LLVM_VERSION}" CXX="${CCACHE} clang++-${LLVM_VERSION} -Qunused-arguments"
-make
\ No newline at end of file