Some changes to facilitate KalimaCache from Android