diff --git a/.travis.yml b/.travis.yml
index 36eafae3..e285923e 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -36,7 +36,7 @@ matrix:
     env: NAME=UbuntuBionic
     cache:
       directories:
-        - $HOME/$NAME/
+      - $HOME/$NAME/
     before_install: docker build -t "cockatrice_${NAME,,}" .ci/$NAME && mkdir -p $HOME/$NAME/.ccache
     script: docker run --mount "type=bind,source=$(pwd),target=/src" -w="/src"
           --mount "type=bind,source=$HOME/$NAME/.ccache,target=/.ccache" -e "CCACHE_DIR=/.ccache"
@@ -49,7 +49,7 @@ matrix:
     env: NAME=UbuntuBionic
     cache:
       directories:
-        - $HOME/$NAME/
+      - $HOME/$NAME/
     before_install: docker build -t "cockatrice_${NAME,,}" .ci/$NAME && mkdir -p $HOME/$NAME/.ccache
     script: docker run --mount "type=bind,source=$(pwd),target=/src" -w="/src"
           --mount "type=bind,source=$HOME/$NAME/.ccache,target=/.ccache" -e "CCACHE_DIR=/.ccache"
@@ -63,7 +63,7 @@ matrix:
     env: NAME=Fedora29
     cache:
       directories:
-        - $HOME/$NAME/
+      - $HOME/$NAME/
     before_install: docker build -t "cockatrice_${NAME,,}" .ci/$NAME && mkdir -p $HOME/$NAME/.ccache
     script: docker run --mount "type=bind,source=$(pwd),target=/src" -w="/src"
           --mount "type=bind,source=$HOME/$NAME/.ccache,target=/.ccache" -e "CCACHE_DIR=/.ccache"
@@ -76,7 +76,7 @@ matrix:
     env: NAME=Fedora29
     cache:
       directories:
-        - $HOME/$NAME/
+      - $HOME/$NAME/
     before_install: docker build -t "cockatrice_${NAME,,}" .ci/$NAME && mkdir -p $HOME/$NAME/.ccache
     script: docker run --mount "type=bind,source=$(pwd),target=/src" -w="/src"
           --mount "type=bind,source=$HOME/$NAME/.ccache,target=/.ccache" -e "CCACHE_DIR=/.ccache"
@@ -87,8 +87,11 @@ matrix:
   - name: macOS (Debug)
     if: tag IS NOT present
     os: osx
-    osx_image: xcode10.1
-    cache: ccache
+    osx_image: xcode9.2
+    cache:
+    - ccache
+    - directories:
+      - $HOME/Library/Caches/Homebrew
     addons:
       homebrew:
         packages:
@@ -98,12 +101,18 @@ matrix:
         - xz
         update: true
     script: bash ./.ci/travis-compile.sh --server --install --debug
+    before_cache:
+    - brew cleanup
+
 
   - name: macOS (Release)
     if: (branch = master AND NOT type = pull_request) OR tag IS present
     os: osx
     osx_image: xcode9.2
-    cache: ccache
+    cache:
+    - ccache
+    - directories:
+      - $HOME/Library/Caches/Homebrew
     addons:
       homebrew:
         packages:
@@ -113,6 +122,9 @@ matrix:
         - xz
         update: true
     script: bash ./.ci/travis-compile.sh --server --package "$TRAVIS_OS_NAME" --release
+    before_cache:
+    - brew cleanup
+
 
 # Builds for pull requests skip the deployment step altogether
 deploy: