Add cache, but this time taking in cosideration the current user