Added new caching classes