Fixed #1999 by replacing the 'no-cache' parameter if it is there instead of just...