Caching system needs some work