Fix the tree-change to work with problem caching.

A better fix is needed.