Moving manual caching to Client, adding override #get! method. It's ugly but it works for now.