By default system use last payment. We put Cache on delivery as last as system works with it without adding additional information. Not like with Credit card.
(cherry picked from commit 8722823)
no need to set fnc when changing config values
(cherry picked from commit 1170f78)