refactor for data import caching
refactor for data import caching