MDL-38565 cache: upgrade code to amend default stores