Memory leak in DescriptorQueryManager::cachedExpressionQueries when using HistoryPolicy

[aramashkan]

We using HistoryPolicy as below :

public class HistoryCustomizer implements DescriptorCustomizer {
    @Override
    public void customize(ClassDescriptor descriptor) throws Exception {
        HistoryPolicy policy = new HistoryPolicy();
        policy.addHistoryTableName(descriptor.getTables().get(0).getQualifiedName() + "_hist");
        if (descriptor.getTables().size() > 1) {
            policy.addHistoryTableName(descriptor.getTables().get(1).getQualifiedName() + "_hist");
        }
        policy.addStartFieldName("start_date");
        policy.addEndFieldName("end_date");
        policy.setShouldHandleWrites(true);

        descriptor.setHistoryPolicy(policy);
    }
}

After applying customizer keys contained in ConcurrentFixedCache's map will be changed. That's causing leak issue like below: