Changing how text for documents is stored

This will prevent a possible edge case where canonicizers on one event
driver can effect another.
Updating to use bug fix from master