[FIX] Cache by Account_ID
[FIX] Query by Username