On-the-fly cache migration didn't work properly anymore, fix number two