Fixup cache migrations.

Change-Id: Ia9fd5cf723faf822af42f5c46a8e82490454cfa1