Fix caching for user page
Merge branch 'master' into production