Revert "Revert "Dileep,Anishek| 2311 | Optimizing datasender lookup""

This reverts commit 37520ccc7df0f0e7907c8253ab0937c841be7f25.
Dileep,Anishek| 2311 | Optimizing datasender lookup fixing test failure