Addressed some vector caching issues