WIP - works with original, but doesn't yet support versions
More direct approach, hooking into caching flow to rename automatically