Backport: Make NullEngine return the original keys like other engines#18251

othercorey merged 2 commits intocakephp:4.xcakephp/cakephp:4.xfrom

jorisvaesen:4.xjorisvaesen/cakephp:4.xCopy head branch name to clipboard