cache updates
Merge branch 'master' of github.com:TantalumMobile/Tantalum