CLC-4083 Use uid as the cache key to participate in expire functionality