Change default cache loc
fix cache handling