Caching performance fix..
Memory optimization.