Fixed the loading method, also added cache.