Any reason Cache.remove(Fqn, Object) is a void return instead of the prior value for the key? That breaks compatibility with old code. Node.remove(Object) and TreeCache.remove(Fqn, Object) both return the old value so I suspect the void return from Cache wasn't intentional. - Brian