[Cdi2] Correctly cast the UnmanagedInstance values

cdi2/src/main/java/io/cucumber/cdi2/Cdi2Factory.java

@@ -53,9 +53,9 @@ public boolean addClass(final Class<?> clazz) {
 
     @Override
     public <T> T getInstance(final Class<T> type) {
-        final Object instance = standaloneInstances.get(type);
+        final Unmanaged.UnmanagedInstance<?> instance = standaloneInstances.get(type);
         if (instance != null) {
-            return type.cast(instance);
+            return type.cast(instance.get());
         }
         final Instance<T> selected = container.select(type);
         if (selected.isUnsatisfied()) {

cdi2/src/test/resources/META-INF/beans.xml

@@ -1,7 +1,10 @@
-<beans xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xmlns="http://java.sun.com/xml/ns/javaee"
-       xsi:schemaLocation="
-      http://java.sun.com/xml/ns/javaee
-      http://java.sun.com/xml/ns/javaee/beans_1_0.xsd">
-
+<beans xmlns="http://xmlns.jcp.org/xml/ns/javaee"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee http://xmlns.jcp.org/xml/ns/javaee/beans_2_0.xsd"
+    bean-discovery-mode="all" version="2.0">
+    <!-- Exclude the class to force it to be loaded as an unmanaged dependency -->
+    <scan>
+        <exclude
+            name="io.cucumber.cdi2.CdiBellyStepDefinitions" />
+    </scan>
 </beans>

cdi2/src/test/resources/io/cucumber/cdi2/cukes.feature

@@ -6,4 +6,9 @@ Feature: Cukes
 
   Scenario: Eat some more cukes
     Given I have 6 cukes in my belly
-    Then there are 6 cukes in my belly
+    Then there are 6 cukes in my belly
+
+  Scenario: Eat some cukes multiple times
+    Given I have 8 cukes in my belly
+    And I have 8 cukes in my belly
+    Then there are 8 cukes in my belly