Removed context caching