More loading from cache fixes.