am 1d4a9e46: Improve caching for debug contexts.

* commit '1d4a9e4646e8786623daa6ac3917782be56a8fb2':
  Improve caching for debug contexts.