minor stuff
Implemented local caching