Some more tweaking with loading from cache.