2007 gas cap light and small vac leak
 

I have a 2007 4.0 with all wheel drive. I get the gas cap light and check engine light all the time. It says small vac leak. I have had it fixed several times but the same part on the fuel pump keeps breaking. Are there any after market fuel pump assemblies that don't have the big turn in the vent line connection. I smell gas if I go over half a tank. I saw a fix on you tube but I don't want to resort to flex steel on the fitting. This is a dangerous problem that all 4.0 AWD have.