Adding retry logic for singleton and fixing deployment show cache issue