Add some TODOs
Introduce cache, change method of storing in server
Add caching capabilities