Make per request context for repository work
Fix issues with proxy type/content type/composite type