am 897ce641: Merge "Reduce how often we call FindDexCache"

* commit '897ce64153e4758663e464fb5fb339f9a7b496c8':
  Reduce how often we call FindDexCache