Change ClearCache to prevent infinite loop