added support for XCache cache driver.
Fix conflicts.