Cache ODI-specific stuff
Merge pull request #87 from theodi/feature-cache-odi-specific-stuff

Cache ODI-specific stuff