Improved cached Row instances handling