More specifically, the unproxying in o.h.s.engine.spi.DocumentBuilderIndexedEntity.buildDocumentFields() should happen in a smarter way, i.e. it should not be done if all we need is the id and we can get it from the proxy.