DNS-Cache-Manager backport for 2.11