Cache-search-4-29

Hi Lily,

Please run wiki test on this PR. Let me know once you have results.


Tina.