Fix subtree caching - fix to go in CottonCandy branch