Refactor of cash index code; exported names