Merge "Flip client composition cache flag"