More edits
Make cache filenames/extensions more consistent