Reorganised Caching layer
View link tweak