Add caching system for themes3