his reverts commit c2fca795e66e548d6c3c79ebf1bbd5c6f78c6d30 to use the normal tree cache