MDL-38565 cache: tidy up pre-integration

Conflicts:
	lib/db/upgrade.php