Added caching service and caching functionality to lookup