Add cacheable classes