Differentiate caches also by data provided (e.g. domain filter for entitity states)

Differentiate caches also by data provided (e.g. domain filter for entitity states) #334