Fixed path caching issue