adding changes needed for registry UUID cache