Merge branch 'hotfix-1.0.1'
Set caching on view.
Merge branch 'hotfix/views-caching' into develop