Merge in InMemoryCacheSetImpl changes