Added Cache moving support