Yet another set of fixes to the migrate cache system