Started to add a DNS cache
merge merge merge