Some updates to wording, clarifications
Updated to latest cache proposal