Moved calls to caching methods to user class