improve caching though everything it still dysfunctional
Remove space in name