Converted cache to modules API