Consistently use direct subclass of Entity for cache keys

In some cases the name of classes further down the hierarchy were used as cache key. This led to bugs because of varying cache keys.

Fixes: #75 (closed)