topstack: Bring over changes for rds & ecache