There is currently an issue with the builder where calling build will require you manually specify the generic argument at the beginning of the builder.

I think the solution would be to change the entityFactory method to be like <N> Builder<N> entityFactory(EntityFactory<N>) for new builder types.

However this wouldn't exactly fix old factory methods for the builder, so further investigation would be needed.