[release-1.8] 🐛 Use a less expensive method for storage policy

[release-1.8] 🐛 Use a less expensive method for storage policy #746