Cache all the things
Use more future friendly cache keys