Adding fix for user caching.