Added definition expression caching mechanism