Williams: http://new.myfonts.com/fonts/fontbureau/williams-caslon-text/

& a two part piece about it on ILT—
Part I: http://ilovetypography.com/2010/07/26/reviving-caslon-the-snare-of-authe...
Part II: http://ilovetypography.com/2010/11/02/reviving-caslon-part-2-readability...

Adobe Caslon Pro does have swash glyphs, just in case you were unaware.

Victoria, I'm pretty sure that the recent William Caslon Text by William Berkson is a nice contemporary rendition of Caslon:

http://www.fontbureau.com/fonts/williamscaslontext/

Another functional choice - and a different interpretation - would be King's Caslon by Daltoon Maag:

http://www.daltonmaag.com/browse/fonts/dama/kingscaslon

Speaking of Baskerville, I'm currently setting a book in Baskerville 1757 and I have to say that it is great:

http://www.fountaintype.com/typefaces/baskerville-1757/styles