Add default cache dir
Merge branch 'feature/add-cache' into develop
Merge branch 'develop'