Sync changes with the most recent version of EFCache from my codeplex fork.