Revert "Username Password Flow and Cache changes"

This reverts commit 7d66c05916293e84786193493fa96ff5292eeacb.
Added proper code for UsernamePassword Authentication flow