Cached login eviction fix

Hi Les, you are right. I always use emails to login and I forgot about usernames. I will improve this to support usernames too. Sorry!