[CLC-1586] Fix awkward cache expiration logic

JIRA: https://jira.media.berkeley.edu/jira/browse/CLC-1586