Revert "avoid memoizing the base for the cache key if the username is None"

This reverts commit 591a6d0d71c002f8952925e8db9f64194c42cfc9.
release 0.25.2