Merge pull request #22 from jgable/importCaching

Refactor into classes and add faster caching with options.import