Removing user caching look up as it is not needed and creates unexpected results