added caching for registry