Add a small session-cache system to avoid requests Spam.
Resolve Merge conflict