Set caching on views
Merge branch 'hotfix/views-caching'