Fixed cache expire time and add comments