Fix SWIG interface and tests according the zero-cache 2.1 API