ProviderServiceTest caching patched, unit tests improved, flush call
cleaned up