Hmmm, we already have a `InternalEntryFactory`... Can we somehow bring the two together?