diff --git a/equipment/views.py b/equipment/views.py
index c1d667d..8003a1c 100644
--- a/equipment/views.py
+++ b/equipment/views.py
@@ -24,5 +24,5 @@ def all_equipment(request):
     users = Equipment.objects.all()
     serializer = EquipmentSerializer(users, many=True)
     data = serializer.data
-    cache.set('all_equipment', data)
+    cache.set('all_equipment', data, timeout=None)
     return Response(data=data, status=status.HTTP_200_OK)
\ No newline at end of file
diff --git a/exercise/views.py b/exercise/views.py
index bf65a03..8d2e749 100644
--- a/exercise/views.py
+++ b/exercise/views.py
@@ -24,5 +24,5 @@ def all_exercises(request):
     users = Exercise.objects.all()
     serializer = ExerciseSerializer(users, many=True)
     data = serializer.data
-    cache.set('all_exercises', data)
+    cache.set('all_exercises', data, timeout=None)
     return Response(data=data, status=status.HTTP_200_OK)
\ No newline at end of file
diff --git a/muscle/views.py b/muscle/views.py
index 821a35a..5e41b93 100644
--- a/muscle/views.py
+++ b/muscle/views.py
@@ -24,5 +24,5 @@ def all_muscles(request):
     users = Muscle.objects.all()
     serializer = MuscleSerializer(users, many=True)
     data = serializer.data
-    cache.set('all_muscles', data)
+    cache.set('all_muscles', data, timeout=None)
     return Response(data=data, status=status.HTTP_200_OK)
\ No newline at end of file
diff --git a/workout/views.py b/workout/views.py
index e7cd1c0..77bfca3 100644
--- a/workout/views.py
+++ b/workout/views.py
@@ -28,15 +28,22 @@ def all_workouts(request):
     users = Workout.objects.all()
     serializer = WorkoutSerializer(users, many=True)
     data = serializer.data
-    cache.set('all_workouts', data)
+    cache.set('all_workouts', data, timeout=None)
     return Response(data=data, status=status.HTTP_200_OK)
 
 
 @api_view(['GET'])
 def workout_details(request, workout_id):
+    cache_name = "wk"+str(workout_id)
+    if cache_name in cache:
+        data = cache.get(cache_name)
+        return Response(data=data, status=status.HTTP_200_OK)
+    
     workout = Workout.objects.get(pk=workout_id)
     serializer = WorkoutDetailSerializer(workout, many=False)
-    return Response(data=serializer.data, status=status.HTTP_200_OK)
+    data = serializer.data
+    cache.set(cache_name, data, timeout=300)
+    return Response(data = data, status=status.HTTP_200_OK)
 
 @api_view(['POST'])
 @authentication_classes([TokenAuthentication])