Remove term context caching

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