minor changes to remove the use of ricache