Removed caching, pro only feature.
Merge branch 'master' into development