Revert "Enable basket caching only if caching isn't disabled"

This reverts commit 1e71c5692be12d52bab7d1a53aa72744d79d2e69.
Improve password helper