Split cache module, some small fixes