Fix bug in FileStore due to bad rebase 

Fix bug in FileStore due to my bad rebase (undefined constant ```EXPIRE_TIMER_CACHE```).  Sorry about that!

Also updated ```EXPIRES_IN_SECONDS``` variable names per code review.