Merge "Fix cache flush always causing response change"