Implemented cache only / Fixes suggested by Jelle
Merge remote-tracking branch 'origin/cacheonly' into cacheonly