revised locking in RegistryCore