use new httpcache API
add diffStruct helper for tests and fix tests