Removed calls to Layout's cache