try to address hashing/equality problems and fix caches

Merged Martin Reinecke requested to merge issue77_2 into master

Merge request reports