Included missing files and added cache