added possibility to clear the cache
Merge branch 'develop-local'