Merge "Drop XCache support"