Re-added improved user cache.
Two comments and a deleted old block.