Started added caching, snippet, tweaks + fixes