Fixed import in testsuite.serving
Fixed contrib.cache