#935 - Change variable scope, pass the requestingField to persistence handlers