Improvements to EtaCache, ShoppinglistManager. Refactoring of package structure