Port RedisCache to 3.3
Merge branch '0.9-maintenance'