diff --git a/src/com/android/contacts/ContactsApplication.java b/src/com/android/contacts/ContactsApplication.java
index df12cf8..1e5c14e 100644
--- a/src/com/android/contacts/ContactsApplication.java
+++ b/src/com/android/contacts/ContactsApplication.java
@@ -17,7 +17,14 @@
 package com.android.contacts;
 
 import android.app.Application;
+import android.content.Context;
 import android.os.StrictMode;
+import android.preference.PreferenceManager;
+
+import java.util.Locale;
+
+import com.android.contacts.model.AccountTypes;
+import com.google.i18n.phonenumbers.PhoneNumberUtil;
 
 public final class ContactsApplication extends Application {
 
@@ -25,6 +32,12 @@
     public void onCreate() {
         super.onCreate();
 
+        // Priming caches to placate the StrictMode police
+        Context context = getApplicationContext();
+        PreferenceManager.getDefaultSharedPreferences(context);
+        PhoneNumberUtil.getInstance().getAsYouTypeFormatter(Locale.getDefault().getCountry());
+        AccountTypes.getInstance(context);
+
         StrictMode.setThreadPolicy(
                 new StrictMode.ThreadPolicy.Builder().detectAll().penaltyLog().build());
     }
