#1241: Fixing performance issue in ItemRegistryImpl