Updated support for Xcache 3.1.0