Fixed cache expire time and add comments
Merge branch 'development' into release
Merge branch 'release'