Changed the way data is loaded to cache