Doesn't access _REGISTRY directly anymore.