diff --git a/src/seasidecache.cpp b/src/seasidecache.cpp
index bb8f288..ccee7c2 100644
--- a/src/seasidecache.cpp
+++ b/src/seasidecache.cpp
@@ -2209,8 +2209,10 @@ bool SeasideCache::updateContactIndexing(const QContact &oldContact, const QCont
                     resolveUnknownAddresses(address.first, address.second, item);
                 }
 
-                if (!m_phoneNumberIds.contains(address.second, iid))
-                    m_phoneNumberIds.insert(address.second, iid);
+                CachedPhoneNumber cachedPhoneNumber(normalizePhoneNumber(phoneNumber.number()), iid);
+
+                if (!m_phoneNumberIds.contains(address.second, cachedPhoneNumber))
+                    m_phoneNumberIds.insert(address.second, cachedPhoneNumber);
             }
         }
 
@@ -2218,7 +2220,7 @@ bool SeasideCache::updateContactIndexing(const QContact &oldContact, const QCont
         if (!oldAddresses.isEmpty()) {
             modified = true;
             foreach (const StringPair &address, oldAddresses) {
-                m_phoneNumberIds.remove(address.second, iid);
+                m_phoneNumberIds.remove(address.second);
             }
             oldAddresses.clear();
         }
@@ -3310,23 +3312,23 @@ void SeasideCache::resolveAddress(ResolveListener *listener, const QString &firs
 
 SeasideCache::CacheItem *SeasideCache::itemMatchingPhoneNumber(const QString &number, const QString &normalized, bool requireComplete)
 {
-    QMultiHash<QString, quint32>::const_iterator it = m_phoneNumberIds.find(number), end = m_phoneNumberIds.constEnd();
+    QMultiHash<QString, CachedPhoneNumber>::const_iterator it = m_phoneNumberIds.find(number), end = m_phoneNumberIds.constEnd();
     if (it != end) {
         // How many matches are there for this number?
         int matchCount = 1;
-        QMultiHash<QString, quint32>::const_iterator matchingIt = it + 1;
+        QMultiHash<QString, CachedPhoneNumber>::const_iterator matchingIt = it + 1;
         while ((matchingIt != end) && (matchingIt.key() == number)) {
              ++matchCount;
              ++matchingIt;
         }
         if (matchCount == 1)
-            return itemById(*it, requireComplete);
+            return itemById(it->iid, requireComplete);
 
         // Choose the best match from these contacts
         int bestMatchLength = 0;
         CacheItem *matchItem = 0;
         for ( ; matchCount > 0; ++it, --matchCount) {
-            if (CacheItem *item = existingItem(*it)) {
+            if (CacheItem *item = existingItem(it->iid)) {
                 int matchLength = bestPhoneNumberMatchLength(item->contact, normalized);
                 if (matchLength > bestMatchLength) {
                     bestMatchLength = matchLength;
diff --git a/src/seasidecache.h b/src/seasidecache.h
index d041fb8..1f76874 100644
--- a/src/seasidecache.h
+++ b/src/seasidecache.h
@@ -139,6 +139,21 @@ class CONTACTCACHE_EXPORT SeasideCache : public QObject
         void *key;
     };
 
+    struct CachedPhoneNumber
+    {
+        CachedPhoneNumber() {}
+        CachedPhoneNumber(const QString &n, quint32 i) : normalizedNumber(n), iid(i) {}
+        CachedPhoneNumber(const CachedPhoneNumber &other) : normalizedNumber(other.normalizedNumber), iid(other.iid) {}
+
+        bool operator==(const CachedPhoneNumber &other) const
+        {
+            return other.normalizedNumber == normalizedNumber && other.iid == iid;
+        }
+
+        QString normalizedNumber;
+        quint32 iid;
+    };
+
     struct CacheItem
     {
         CacheItem() : itemData(0), iid(0), statusFlags(0), contactState(ContactAbsent), listeners(0), filterMatchRole(-1) {}
@@ -422,7 +437,7 @@ private slots:
     QBasicTimer m_expiryTimer;
     QBasicTimer m_fetchTimer;
     QHash<quint32, CacheItem> m_people;
-    QMultiHash<QString, quint32> m_phoneNumberIds;
+    QMultiHash<QString, CachedPhoneNumber> m_phoneNumberIds;
     QHash<QString, quint32> m_emailAddressIds;
     QHash<QPair<QString, QString>, quint32> m_onlineAccountIds;
     QHash<QContactId, QContact> m_contactsToSave;