Further password cache work