Revert "Use merge() to update cache data"

This reverts commit c60aa68d163f08afa76eb386d1012f5ba5fcd7b7.

Change-Id: Ib31d361f9a7d579200dfaab277cd7d503124864c