adding changes for UUID Cache - Related to changes done by Pulasthi