Fixing cache problem, fixing links