Fix deserializer, cache