Combined both cache classes
Merge origin/master