Fixed CCache to use map