Fix cache for pages and templates. Version v0.8.16
Merge branch 'develop'