Hotfix for content module.
Merge branch 'cacheClass' into dev