Fixed import in testsuite.serving
Fixed contrib.cache
Merge pull request #1 from untitaker/python3