last fix for work; add cache directories
Merge remote-tracking branch 'origin/do_travis_work' into do_travis_work