Fix tree cache again