Fix imports for changes in Caustic

Signed-off-by: Nick Minkler <sleaker@gmail.com>