Fix #1491 : Fix cache serialization in case of controlled vocabulary