Fixed caching bugs and changed link text