Cherry Pick welecome controller cache changes from 3_0_maint