Changed the contact service so that it returns a map of contacts keyed by phone numbers and can thus be easily cached if need be.