Overhauled caching for provider machine and driver, This update requires rtwo version 0.1.7-dev-3 or later