Removed lookup handler and added framework for environment cache