Merge branch 'hotfix-1.0.7'
Set caching on views
Merge branch 'hotfix/views-caching' into develop