diff --git a/.travis.yml b/.travis.yml
index 5944e73..f7c9705 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -6,13 +6,15 @@ dist: trusty
 
 env:
   global:
-    - DEVKITPRO=$HOME/devkitPro
+    - DEVKITPRO=/opt/devkitpro    
+    - DEVKITPPC=/opt/devkitpro/devkitPPC
     - PORTLIBREPOS=$HOME/portlibrepos
 
 cache:
   directories:
     - "$HOME/.local"
     - "$PORTLIBREPOS"
+    - "$DEVKITPRO"
 
 addons:
   apt:
@@ -22,17 +24,17 @@ addons:
 before_install:
   - mkdir -p "${PORTLIBREPOS}"
   - mkdir -p "${DEVKITPRO}"
-  - main_cwd=$(pwd)
   - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then wget https://github.com/devkitPro/pacman/releases/download/devkitpro-pacman-1.0.1/devkitpro-pacman.deb -O /tmp/devkitpro-pacman.deb; fi
   - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then sudo dpkg -i /tmp/devkitpro-pacman.deb; fi
   - yes | sudo dkp-pacman -Syu devkitPPC
-  - export DEVKITPPC=/opt/devkitpro/devkitPPC
 
 install:
   - cd $PORTLIBREPOS
   - ((git clone https://github.com/Maschell/dynamic_libs.git -b lib && (7z x -y ./dynamic_libs/libs/portlibs.zip -o${DEVKITPRO})) || (cd dynamic_libs && git pull))
   - (cd dynamic_libs && ((make -j8 | grep -c "built ... ") && make install && echo "installed" ) || (echo "no need for make install" && make))
 
+before_script:
+  - cd $TRAVIS_BUILD_DIR/
+  
 script:
-  - cd $main_cwd
   - make && make install
\ No newline at end of file