Fixing some lint errors
Merge pull request #35 from javallone/caching_refactor

Fixing some lint errors