Merge "Add time-to-live (TTL) support to resolver cache"