Closed #223 Increase cache performance