Switch back to upstream string-cache