WIP: further simplifying context cache