Move system directory cache out of utils