Updated property Castle resolution

Using a custom dependency for property registration to avoid internal exception when resolving properties. Fixes #1989