Change: ValueCache for several cases
Change: ValueCache for several cases
Refactor
Change