More TBUtils/caching improvements.