Improved support for ContentProviders and injection