LILY-459: improve case archiving