Better XCache support (#91 issue)