more Contacts code reorg

Merge the ContactInfoCache code into the Contacts code.  The general organization
now is that all the interesting work happens in Contact.ContactsCache.
4 files changed