MDL-37069 cachestore_xcache: tidied up