Fix the serialisation of request and response matchers