SCA-21 Fixed user caching