Switched to Objectify pre-persist