Ensured caching
Removed obsolete cache dir
Merge branch 'master' into release