Fixed view cache issue