simplify definition caching.