am 736f5af0: Fixing some IconCache methods not  thread safe

* commit '736f5af04cfb6f168c1f643874a7d3f82b5f51cc':
  Fixing some IconCache methods not  thread safe