Changes to support multiple provisioner instances, caching changed accordingly, other refactoring