Making entity manager interfaces consistent: removing duplicate methods (findById/getEntity/..) and make sure they pass the entity cache