general: fix for potential crashes due to using cached/invalid MFn