Moved cache class to separate package
Renamed to a more appropriate name