@Tom if you have some time, I would suggest the following PRs with new API for review: • https://github.com/wiremock/wiremock/pull/2283 • https://github.com/wiremock/wiremock/pull/2263 • https://github.com/wiremock/wiremock/pull/1981 Not a big deal if it goes into the next release IMHO, the versions are cheap