More fixes for link caching