Fix master issue with new CachingRegistry and unregister() operation