Fixed bug in cache controller
Merge branch 'origin/dev'