Finally figured out what was causing this code. I did replace the fuel cap with the new updated one also.
This is the culprit (#8 on diagram), but does anyone have info on # 6 and should I replace?
https://www.realoem.com/bmw/enUS/sho...diagId=16_0619