include test fixes from plone.app.caching