Add cache and categories
Merge branch 'master' of github.com:giorgiovinci/amshackathon