...
remove explicit cache class
...