OK, had a really good look, took off the gas flap, filler nozzle guard and took off the underjeep plastic guard to look up and around. No leaks, no perishing rubber, no corroded metal nothing really. All checked out.
I did notice fumes around the filler area so I'm really thinking it's the cap...