Use proper cid in codeinput cache.
Merge pull request #2316 from matham/master

Use proper cid in codeinput cache.