Added caching + finish import