Port RedisCache to 3.3