Refactor EntitySaveGuard into its own class
Support a "GuestUserSessionId" by default
Controllers for multiple controller scenarios