Merge "Made User::invalidateCache() use touch() instead of the DB query"