For ENG-5201, remove uneccessary memoization and handle failed local address lookup