am f59830ff: Merge "Synchronize access to the annotation cache."

* commit 'f59830ffbfbcb9bfb0109061ca54d298b7b66801':
  Synchronize access to the annotation cache.