performance enhancements, better caching
performance tweaks