Mf probe cleanup2

Cache fixed.
MFA fixed.