Changed handling of cache_path [ci skip]