Further documentation updates and renaming the cache contexts.