caching of capabilities causes problems

I use one base URL for both WMS and WFS services, this URL is linked to UMN Mapserver and will return different capabilities depending on both the User and the service (WFS|WMS). This works fine in CadCorp and Jump but uDIG seems to cache the capabilities even between uDIG restarting, it also seems to make assumptions about the service behind the URL, for instance if the first ever call I make is from adding a WMS layer then it will always issue SERVICE=WMS against the URL so that if I add a WFS layer using the same URL it actually issues a WMS getCapabilities rather than a WFS one and will list all the WMS layers I have rather than my WFS ones.