Well I just got the bike back with a shiny new filler cap and also a front crankcase cover all sorted under warranty (now expired). And the £300 extended warranty which I decided not to take up was in fact the dealers own warranty (I was wrong).
Trouble is, the rest of the bike looks grubby now and it looks like I may have to clean it (or hope for rain).