Bug 2287 - TypeProviderImpl retains empty HashMaps