Lps 49135 and LPS-48578

Hi Shuyang,

Changes for these two tickets should be together, or else cache does not work well.


Tina.