Slight changes to retrieval of cached files