The "graceful" aspect is a follow on in my opinion. It would require us tracking whether a region name is re-used as we are building the SF. It's doable, just more involved.

In the meantime I just added an option to specify the CacheKeysFactory impl to use. As hibernate-infinispan is the only one using this atm, that is the only place the setting has any effect currently.