Removed Factory and internal caching/wildcard improvements

• Breaking Change: removing the Factory as it felt like it was just being a Service Locator (which isn't good, in this scenario).
• Some internal caching improvements and wildcard improvement support.