Fix issue with cached key sub views getting broken