Cosmetic change: get rid of compile time warnings
Improved tree cache fill up - 1st iteration.

PUB-609