Improved file paths for includes and cache files.