Allow chaching of the WebDriver objects
Other misc changes