Changed class names
Reworked cache API