Tweak to cacheLoader to make a move to futures easier

The postCalc callback makes attaching onComplete events to a returned
future easier/more flexible - so we can add an onComplete with the
'fix' call.