Working on adding cache