Fix race accessing plugin storage map Upstream-commit: 2e3a62152373af5d7238a375785cfdf39b413919 Component: engine