Separates caching for tree and attribute filter to reduce number of tags
Reduces the number of tags stored in the cache
Revert "Separates caching for tree and attribute filter to reduce number of tags"

This reverts commit 04259a8d3940bd069c98c6947964f5a1b4e70ea4.
Adapts tests due to reduced number of tags
Merge pull request #662 from nsendetzky/master

Reduces the number of tags stored in the cache