[ClearSuite] Update for Data-Caching