Renamed the bucket classes and interface to clear up things

Started working on Caching Connections locally