Use instance cache and assorted refactorings
Git fetch
Merge pull request #1 from dcadenas/master

Use instance cache and assorted refactorings