Merge "Make DNS cache lifecycle management explicit"