Change cache to be asynchronous