Adjust handling of multiple @Display annotations in an @Evidence annotation.

When an @Evidence annotation contains more than one @Display annotation, make sure the template cache takes that into account so that the correct template for each display is used.