case 2405 - Improve terms caching; compute type term state.