Caching classes now added, need implemented