diff --git a/.travis.yml b/.travis.yml
index 1f16c4ad409655bf9270862bb511fbf0be126faa..c05108adae188bd83b86ee0f6bf444169f022235 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -13,20 +13,20 @@ matrix:
     include:
         - os: linux
           env: SPEC=linux-g++-64 CONFIG=debug
-          sudo: true
+          sudo: false
         - os: linux
           env: SPEC=linux-g++-64 CONFIG=installer
-          sudo: true
+          sudo: false
         - os: osx
           osx_image: xcode7
           env: SPEC=macx-clang CONFIG=debug
         - os: osx
           osx_image: xcode7
           env: SPEC=macx-clang CONFIG=installer
-        - os: android
-          language: android
-          env: SPEC=android-g++ CONFIG=debug
-          sudo: false
+#        - os: android
+#          language: android
+#          env: SPEC=android-g++ CONFIG=debug
+#          sudo: false
         - os: android
           language: android
           env: SPEC=android-g++ CONFIG=installer
@@ -38,8 +38,25 @@ android:
     - build-tools-21.1.1
     - android-21
 
+addons:
+  apt:
+    sources:
+    - ubuntu-toolchain-r-test
+    packages:
+    - ccache
+    - espeak
+    - g++-4.8
+    - gcc-4.8
+    - libc6-i386
+    - libespeak-dev
+    - libopenscenegraph-dev
+    - libsdl1.2-dev
+    - libudev-dev
+
 cache:
-  - apt
+  directories:
+    - $HOME/.ccache
+
 
 before_install:
   - cd ${TRAVIS_BUILD_DIR} && git fetch --unshallow && git fetch --tags
@@ -49,10 +66,7 @@ before_install:
 
 install:
   - if [ "${TRAVIS_OS_NAME}" = "linux" ]; then
-         sudo apt-add-repository -y ppa:ubuntu-toolchain-r/test
-      && sudo apt-get -qq update
-      && sudo apt-get -qq install g++-4.8 espeak libespeak-dev libopenscenegraph-dev libsdl1.2-dev libudev-dev
-      && wget https://s3-us-west-2.amazonaws.com/qgroundcontrol/dependencies/Qt5.5.1-linux.tar.bz2
+         wget https://s3-us-west-2.amazonaws.com/qgroundcontrol/dependencies/Qt5.5.1-linux.tar.bz2
       && tar jxf Qt5.5.1-linux.tar.bz2 -C /tmp
       && export PATH=/tmp/Qt/5.5/gcc_64/bin:$PATH
       && export CXX="g++-4.8"
@@ -80,6 +94,13 @@ install:
 
 
 before_script:
+# setup ccache
+  - mkdir -p ~/bin
+  - ln -s /usr/bin/ccache ~/bin/g++
+  - ln -s /usr/bin/ccache ~/bin/g++-4.8
+  - ln -s /usr/bin/ccache ~/bin/gcc
+  - ln -s /usr/bin/ccache ~/bin/gcc-4.8
+  - export PATH=~/bin:$PATH
   - if [[ "${TRAVIS_OS_NAME}" = "android" && "${CONFIG}" = "installer" && -z ${ANDROID_STOREPASS} ]]; then export CONFIG=release; fi
   - qmake -r qgroundcontrol.pro CONFIG+=${CONFIG} CONFIG+=WarningsAsErrorsOn -spec ${SPEC}