Fixed caller dependency on provider-root