Port pre_block_migration to new image caching
Port pre_block_migration to new image caching

This resolves bug 1036419, which was a missed call to _cache_image
when that method was refactored away.

Change-Id: I68f6aced5382e378dc707fd003d27dbfdd24aded

n0ano/ganttclient