Improved speed for caching lazy loading