Add caching to views.
Merge branch 'hotfix/views-caching'