Merge "Fix AppCache when either no path or an invalid path is supplied"