adding changes for UUID Cache