Merge "Second pass tying into dns cache per interface"