Revert "Separates caching for tree and attribute filter to reduce number of tags"

This reverts commit 04259a8d3940bd069c98c6947964f5a1b4e70ea4.