- Renaming *LockDriver to *Lock since it isn't a "driver" anymore
- Refactor Cache classes - Refactor Lock classes - Improved test speed (removed some seperate class annotations)