Some cleanup in Entity + more Entity caching. Decision Context Myself and Target are both an Entity now, which makes accessing types a lot easier.