diff --git a/.install-cmake.sh b/.install-cmake.sh
index f4be8eb693..2c263766cd 100755
--- a/.install-cmake.sh
+++ b/.install-cmake.sh
@@ -1,6 +1,11 @@
 #!/bin/sh
-set -ex
-wget http://www.cmake.org/files/v3.2/cmake-3.2.2.tar.gz
-tar -xzvf cmake-3.2.2.tar.gz
-cd cmake-3.2.2 && ./configure && make && sudo make install
+set -e
+# See if the cmake folder is empty.
+if [ ! -d "$HOME/cmake/lib" ]; then
+	wget http://www.cmake.org/files/v3.3/cmake-3.3.1.tar.gz
+	tar -xzf cmake-3.3.1.tar.gz
+	cd cmake-3.3.1 && ./configure --prefix=$HOME/cmake && make && make install
+else
+	echo "Using cached directory."
+fi
 
diff --git a/.travis.yml b/.travis.yml
index ea8ed113de..6f213af8c6 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,5 +1,11 @@
 language: cpp
 
+cache:
+    directories:
+      - $HOME/cmake
+
+sudo: false
+
 compiler:
     - clang
     - gcc
@@ -8,28 +14,32 @@ notifications:
     email: false
     irc: "chat.freenode.net#stepmania-devs"
 
+addons:
+    apt:
+        packages:
+            - nasm
+            - libmad0-dev
+            - libgtk2.0-dev
+            - binutils-dev
+            - libasound-dev
+            - libpulse-dev
+            - libjack-dev
+            - libc6-dev
+            - libogg-dev
+            - libvorbis-dev
+            - libbz2-dev
+            - libjpeg8-dev
+            - libpng12-dev
+            - libxtst-dev
+            - libxrandr-dev
+            - libglu1-mesa-dev
+            - mesa-common-dev
+            - libglew-dev
+
 before_script:
-    - sudo apt-get update -qq
-    - sudo apt-get install -y nasm
-    - sudo apt-get install -y libmad0-dev
-    - sudo apt-get install -y libgtk2.0-dev
-    - sudo apt-get install -y binutils-dev
-    - sudo apt-get install -y libasound-dev
-    - sudo apt-get install -y libpulse-dev
-    - sudo apt-get install -y libjack-dev
-    - sudo apt-get install -y libc6-dev
-    - sudo apt-get install -y libogg-dev
-    - sudo apt-get install -y libvorbis-dev
-    - sudo apt-get install -y libbz2-dev
-    - sudo apt-get install -y zlib1g-dev
-    - sudo apt-get install -y libjpeg8-dev
-    - sudo apt-get install -y libpng12-dev
-    - sudo apt-get install -y libxtst-dev libxrandr-dev
-    - sudo apt-get install -y libglu1-mesa-dev
-    - sudo apt-get install -y mesa-common-dev
-    - sudo apt-get install -y libglew-dev
-    - ./.install-cmake.sh
+    - bash .install-cmake.sh
 
 script:
-    - cmake -DWITH_PORTABLE_TOMCRYPT=ON -G 'Unix Makefiles'
+    - cd Build
+    - $HOME/cmake/bin/cmake -DWITH_PORTABLE_TOMCRYPT=ON -G 'Unix Makefiles' ..
     - make