Flotsam cache fix, back ported. Testing