Solve #22353 and a couple other CachedStaticFiles warts for MMF