adding changes for registry UUID cache