CLC-1652 Don't expire cache if user ID is null
Merge pull request #947 from ctweney/clc-1652

CLC-1652 Don't expire cache if user ID is null