The Servlet cache in XmlaSupport was only factoring the datasource text into the cache key and not the callback.  This could cause an instance of Servlet to be returned with a different callback class.  Several Xmla tests were failing when run in the full suite because the wrong callback was being used.