Internal cache serialization issue fix