Revert "Fix subtree caching"

This reverts commit 65bf312a6f966ddc23e8d807ce83204110d2aaf1.
Revert "Merge pull request #1691 from junmendoza/CottonCandyJun"

This reverts commit b31737f627e11f2ffd17df5288e1c31e5827295b, reversing
changes made to 8872edc21bf3a4c0e60106ce07750a05013b3ab8.