Fix wrong method used in the parser; rewrite some of the import handler so caching works properly