Update CipherCodec to try and fix issues.