Improve caching
Merge branch 'master' of https://github.com/nicolqs/Sun-Trip