CharBufferCache: some modifications

But still not usable at this point.