Changed ContextCleaner to use ReferenceQueue instead of finalizer
Changes based on PR comments.