cachedContentProvider: add tests
contentProviders: move to sub-folder