Fixing Path_Cache issues