diff --git a/.travis.yml b/.travis.yml
index f5f8984..d9dd231 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -2,8 +2,14 @@ language: cpp
 
 cache:
   directories:
+    - ${HOME}/PawPawBuilds/builds
     - ${HOME}/PawPawBuilds/debs
     - ${HOME}/PawPawBuilds/downloads
+    - ${HOME}/PawPawBuilds/targets/linux
+    - ${HOME}/PawPawBuilds/targets/macos
+    - ${HOME}/PawPawBuilds/targets/macos-old
+    - ${HOME}/PawPawBuilds/targets/win32
+    - ${HOME}/PawPawBuilds/targets/win64
 
 env:
   global:
@@ -77,9 +83,10 @@ install:
 
 script:
   - bash ${TRAVIS_BUILD_DIR}/bootstrap-plugins.sh ${TARGET}
-  - bash ${TRAVIS_BUILD_DIR}/build-plugins.sh ${TARGET} ${PLUGINS}
+  - bash ${TRAVIS_BUILD_DIR}/.cleanup.sh ${TARGET}
 
 before_deploy:
+  - bash ${TRAVIS_BUILD_DIR}/build-plugins.sh ${TARGET} ${PLUGINS}
   - bash ${TRAVIS_BUILD_DIR}/pack-plugins.sh ${TARGET} ${PLUGINS}
 
 deploy:
@@ -91,7 +98,6 @@ deploy:
     - setup/inno/PawPaw-*.exe
     - setup/macos/PawPaw-*.pkg
     #- setup/macos-universal/PawPaw-*.pkg
-  skip_cleanup: true
   on:
     all_branches: true