Some changes and caching