Added caching system.