Simplifies the caching interfaces and updates the CacheHelper to expose the different caching levels (obsoletes it's normal methods)
Merge remote-tracking branch 'origin/7.0.0' into 7.0.0