diff --git a/compiler/optimizing/inliner.cc b/compiler/optimizing/inliner.cc
index e1cf248..79cd704 100644
--- a/compiler/optimizing/inliner.cc
+++ b/compiler/optimizing/inliner.cc
@@ -63,7 +63,7 @@
 static constexpr size_t kMaximumNumberOfRecursiveCalls = 4;
 
 // Controls the use of inline caches in AOT mode.
-static constexpr bool kUseAOTInlineCaches = false;
+static constexpr bool kUseAOTInlineCaches = true;
 
 // We check for line numbers to make sure the DepthString implementation
 // aligns the output nicely.
diff --git a/test/knownfailures.json b/test/knownfailures.json
index 8c7eb11..1738acf 100644
--- a/test/knownfailures.json
+++ b/test/knownfailures.json
@@ -362,12 +362,6 @@
         "variant": "interp-ac"
     },
     {
-        "tests": ["638-checker-inline-caches",
-                  "644-checker-deopt"],
-        "description": ["Disabled temporarily until a fix arrives."],
-        "bug": "http://b/36371709"
-    },
-    {
         "tests": ["629-vdex-speed",
                   "634-vdex-duplicate"],
         "description": ["Profile driven dexlayout does not work with vdex."],