Dev
Cache lifetime, composer update
Merge branch 'develop'