Fix bug in FileStore due to bad rebase (undefined constant EXPIRE_TIMER_CACHE). Also updated EXPIRES_IN_SECONDS variable names per code review.