fixed issue with cache module
Merge branch 'dev'