I just merged in a big refactoring which changes classes that were using GemFireCacheImpl to using InternalCache.
InternalCache is an interface representing the internal view of Cache which exposes all the operations that aren't exposed in the User API of Cache or GemFireCache. InternalCache and GemFireCacheImpl are still too big and need to be broken out but this is one step in refactoring. If you need to create or change a class to use GemFireCacheImpl, please make that class depend on InternalCache instead. Also, please pass the InternalCache instance to the constructor instead of reaching out from the class to call GemFireCacheImpl.getInstance or CacheFactory.getAnyInstance. This will reduce the number of classes we need to change in further refactoring to reduce the use of these singleton accessors. If you encounter any merge conflicts caused by my commit, please let me know and I'll do what I can to help. Thanks, Kirk
