Modifying to only use master cache