[TASK] Correct caching of providers
[TASK] Correct conditions that trigger a provider