Remove term context caching

**please review**

too lazy to cherry pick -- please review after merging #562