Performance related changes

Added caching where I could