Fixed machine caching so that it can be invalidated per-provider.
V0.1.8-dev-5 - Support for invalidating the machine cache per provider