Fixed the caching system, now puts all data correctly